Remove forwarded-from note and drop geo-blocked radio
This commit is contained in:
1 parent
3649ed5f4d
commit
437fdccfbc
2 files changed
+2
-26
No files matched your search
@@ -200,11 +200,6 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Classical": [
|
"Classical": [
|
||||||
{
|
|
||||||
"name": "Classical California",
|
|
||||||
"desc": "",
|
|
||||||
"url": "https://playerservices.streamtheworld.com/api/livestream-redirect/KDFCFMAAC.aac"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Linn Classical",
|
"name": "Linn Classical",
|
||||||
"desc": "audiophile classical",
|
"desc": "audiophile classical",
|
||||||
|
|||||||
+2
-21
@@ -178,26 +178,7 @@ class TelegramForwarder:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
def _forward_line(self, message) -> str:
|
def _forward_line(self, message) -> str:
|
||||||
"""Note where a forwarded message originally came from."""
|
"""DEPRECATED: forwarded-origin note removed by request."""
|
||||||
try:
|
|
||||||
origin = getattr(message, "forward_origin", None)
|
|
||||||
source = None
|
|
||||||
if origin is not None:
|
|
||||||
otype = getattr(origin, "type", "")
|
|
||||||
if otype == "user" and getattr(origin, "sender_user", None):
|
|
||||||
user = origin.sender_user
|
|
||||||
source = (user.first_name or "") + (
|
|
||||||
f" {user.last_name}" if user.last_name else "")
|
|
||||||
elif otype == "hidden_user":
|
|
||||||
source = getattr(origin, "sender_user_name", None)
|
|
||||||
elif otype == "chat" and getattr(origin, "sender_chat", None):
|
|
||||||
source = origin.sender_chat.title
|
|
||||||
elif otype == "channel" and getattr(origin, "chat", None):
|
|
||||||
source = origin.chat.title
|
|
||||||
if not source:
|
|
||||||
return ""
|
|
||||||
return f"-# ↪ forwarded from {entities.escape_discord(source.strip())}\n"
|
|
||||||
except Exception:
|
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
# ── rendering ───────────────────────────────────────────────────────────
|
# ── rendering ───────────────────────────────────────────────────────────
|
||||||
@@ -379,7 +360,7 @@ class TelegramForwarder:
|
|||||||
if rendered:
|
if rendered:
|
||||||
body_parts.append(rendered)
|
body_parts.append(rendered)
|
||||||
|
|
||||||
prefix = self._forward_line(lead) + await self._reply_line(lead, route)
|
prefix = await self._reply_line(lead, route)
|
||||||
content = prefix + "\n".join(body_parts + notes).strip()
|
content = prefix + "\n".join(body_parts + notes).strip()
|
||||||
|
|
||||||
if not content.strip() and not files:
|
if not content.strip() and not files:
|
||||||
|
|||||||
Reference in new issue
Block a user