diff --git a/epicyon-profile.css b/epicyon-profile.css
index f184d9bc1..7ff90bf52 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -1717,6 +1717,22 @@ h3 {
cursor: pointer;
margin: 5px;
}
+ .followApproveHandle {
+ border-radius: var(--button-corner-radius);
+ background-color: var(--main-bg-color);
+ border: none;
+ color: var(--main-fg-color);
+ text-align: center;
+ font-size: var(--font-size-header);
+ font-family: 'Arial, Helvetica, sans-serif';
+ padding: var(--button-height-padding);
+ width: 20%;
+ max-width: 200px;
+ min-width: 80px;
+ cursor: pointer;
+ margin: 0 5px;
+ float: right;
+ }
.followApprove {
border-radius: var(--button-corner-radius);
background-color: var(--button-approve);
@@ -2516,6 +2532,22 @@ h3 {
cursor: pointer;
margin: 15px;
}
+ .followApprove {
+ border-radius: var(--button-corner-radius);
+ background-color: var(--main-bg-color);
+ border: none;
+ color: var(--main-fg-color);
+ text-align: center;
+ font-size: var(--font-size3);
+ font-family: 'Arial, Helvetica, sans-serif';
+ padding: var(--button-height-padding-mobile);
+ width: 20%;
+ max-width: 400px;
+ min-width: 80px;
+ cursor: pointer;
+ margin: 0 15px;
+ float: right;
+ }
.followApprove {
border-radius: var(--button-corner-radius);
background-color: var(--button-approve);
@@ -3313,6 +3345,22 @@ h3 {
cursor: pointer;
margin: 15px;
}
+ .followApproveHandle {
+ border-radius: var(--button-corner-radius);
+ background-color: var(--main-bg-color);
+ border: none;
+ color: var(--main-fg-color);
+ text-align: center;
+ font-size: var(--font-size3);
+ font-family: 'Arial, Helvetica, sans-serif';
+ padding: var(--button-height-padding-tiny);
+ width: 20%;
+ max-width: 400px;
+ min-width: 80px;
+ cursor: pointer;
+ margin: 0 15px;
+ float: right;
+ }
.followApprove {
border-radius: var(--button-corner-radius);
background-color: var(--button-approve);
diff --git a/inbox.py b/inbox.py
index d4442e6f1..499771d4b 100644
--- a/inbox.py
+++ b/inbox.py
@@ -658,11 +658,14 @@ def save_post_to_inbox_queue(base_dir: str, http_prefix: str,
return None
post_domain = get_full_domain(post_domain, post_port)
+ content_str = \
+ get_base_content_from_post(post_json_object, system_language)
+
if has_object_dict(post_json_object):
- if is_quote_toot(post_json_object):
- if debug:
- print('REJECT: inbox quote toot ' + str(post_json_object))
+ if is_quote_toot(post_json_object, content_str):
+ print('REJECT: inbox quote toot ' + str(post_json_object))
return None
+
if post_json_object['object'].get('inReplyTo'):
if isinstance(post_json_object['object']['inReplyTo'], str):
in_reply_to = \
@@ -690,8 +693,6 @@ def save_post_to_inbox_queue(base_dir: str, http_prefix: str,
return None
# filter on the content of the post
- content_str = \
- get_base_content_from_post(post_json_object, system_language)
if content_str:
summary_str = \
get_summary_from_post(post_json_object,
@@ -3312,6 +3313,7 @@ def _like_notify(base_dir: str, domain: str,
liker_handle = actor
if liker_handle == handle:
return
+
like_str = liker_handle + ' ' + url + '?likedBy=' + actor
prev_like_file = account_dir + '/.prevLike'
# was there a previous like notification?
diff --git a/manual/manual.md b/manual/manual.md
index 328d5f1a6..046eb6aad 100644
--- a/manual/manual.md
+++ b/manual/manual.md
@@ -341,7 +341,7 @@ If you want to block particular fediverse accounts or instances then you can ent
Within the *filtering and blocking* section you can also set a city which will be used for geolocation spoofing. When you post a photo, instead of removing all metadata spoofed metadata will be added in order to consistently fool the machine learning systems behind web crawlers or scrapers, and create a [confirmation bias](https://en.wikipedia.org/wiki/Confirmation_bias) effect where the surveillance systems become increasingly confident in an erroneous conclusion. Setting a city somewhere near to your [time zone](https://en.wikipedia.org/wiki/Time_zone) is preferable, so that it matches your typical pattern of daily posting activity without giving away your real location.
### Verifying your website or blog
-It is possible to indicate that a website of blog belongs to you by linking it to your profile screen. Within the *head* html section of your website or blog index page include a line similar to:
+It is possible to indicate that a website or blog belongs to you by linking it to your profile screen. Within the *head* html section of your website or blog index page include a line similar to:
``` html
```
diff --git a/outbox.py b/outbox.py
index eff60a035..d7762a395 100644
--- a/outbox.py
+++ b/outbox.py
@@ -265,7 +265,7 @@ def post_message_to_outbox(session, translate: {},
# check that the outgoing post doesn't contain any markup
# which can be used to implement exploits
if has_object_dict(message_json):
- if is_quote_toot(message_json):
+ if is_quote_toot(message_json, ''):
print('REJECT: POST quote toot ' + str(message_json))
return False
diff --git a/theme/blue/icons/license_cc.png b/theme/blue/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/blue/icons/license_cc.png differ
diff --git a/theme/blue/icons/license_cc0.png b/theme/blue/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/blue/icons/license_cc0.png differ
diff --git a/theme/blue/icons/license_fdl.png b/theme/blue/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/blue/icons/license_fdl.png differ
diff --git a/theme/blue/icons/license_un.png b/theme/blue/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/blue/icons/license_un.png differ
diff --git a/theme/blue/icons/license_wtf.png b/theme/blue/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/blue/icons/license_wtf.png differ
diff --git a/theme/debian/icons/license_cc.png b/theme/debian/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/debian/icons/license_cc.png differ
diff --git a/theme/debian/icons/license_cc0.png b/theme/debian/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/debian/icons/license_cc0.png differ
diff --git a/theme/debian/icons/license_fdl.png b/theme/debian/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/debian/icons/license_fdl.png differ
diff --git a/theme/debian/icons/license_un.png b/theme/debian/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/debian/icons/license_un.png differ
diff --git a/theme/debian/icons/license_wtf.png b/theme/debian/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/debian/icons/license_wtf.png differ
diff --git a/theme/default/icons/license_cc.png b/theme/default/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/default/icons/license_cc.png differ
diff --git a/theme/default/icons/license_cc0.png b/theme/default/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/default/icons/license_cc0.png differ
diff --git a/theme/default/icons/license_fdl.png b/theme/default/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/default/icons/license_fdl.png differ
diff --git a/theme/default/icons/license_un.png b/theme/default/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/default/icons/license_un.png differ
diff --git a/theme/default/icons/license_wtf.png b/theme/default/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/default/icons/license_wtf.png differ
diff --git a/theme/hacker/icons/license_cc.png b/theme/hacker/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/hacker/icons/license_cc.png differ
diff --git a/theme/hacker/icons/license_cc0.png b/theme/hacker/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/hacker/icons/license_cc0.png differ
diff --git a/theme/hacker/icons/license_fdl.png b/theme/hacker/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/hacker/icons/license_fdl.png differ
diff --git a/theme/hacker/icons/license_un.png b/theme/hacker/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/hacker/icons/license_un.png differ
diff --git a/theme/hacker/icons/license_wtf.png b/theme/hacker/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/hacker/icons/license_wtf.png differ
diff --git a/theme/henge/icons/license_cc.png b/theme/henge/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/henge/icons/license_cc.png differ
diff --git a/theme/henge/icons/license_cc0.png b/theme/henge/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/henge/icons/license_cc0.png differ
diff --git a/theme/henge/icons/license_fdl.png b/theme/henge/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/henge/icons/license_fdl.png differ
diff --git a/theme/henge/icons/license_un.png b/theme/henge/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/henge/icons/license_un.png differ
diff --git a/theme/henge/icons/license_wtf.png b/theme/henge/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/henge/icons/license_wtf.png differ
diff --git a/theme/indymediaclassic/icons/license_cc.png b/theme/indymediaclassic/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/indymediaclassic/icons/license_cc.png differ
diff --git a/theme/indymediaclassic/icons/license_cc0.png b/theme/indymediaclassic/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/indymediaclassic/icons/license_cc0.png differ
diff --git a/theme/indymediaclassic/icons/license_fdl.png b/theme/indymediaclassic/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/indymediaclassic/icons/license_fdl.png differ
diff --git a/theme/indymediaclassic/icons/license_un.png b/theme/indymediaclassic/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/indymediaclassic/icons/license_un.png differ
diff --git a/theme/indymediaclassic/icons/license_wtf.png b/theme/indymediaclassic/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/indymediaclassic/icons/license_wtf.png differ
diff --git a/theme/indymediamodern/icons/license_cc.png b/theme/indymediamodern/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/indymediamodern/icons/license_cc.png differ
diff --git a/theme/indymediamodern/icons/license_cc0.png b/theme/indymediamodern/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/indymediamodern/icons/license_cc0.png differ
diff --git a/theme/indymediamodern/icons/license_fdl.png b/theme/indymediamodern/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/indymediamodern/icons/license_fdl.png differ
diff --git a/theme/indymediamodern/icons/license_un.png b/theme/indymediamodern/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/indymediamodern/icons/license_un.png differ
diff --git a/theme/indymediamodern/icons/license_wtf.png b/theme/indymediamodern/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/indymediamodern/icons/license_wtf.png differ
diff --git a/theme/lcd/icons/license_cc.png b/theme/lcd/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/lcd/icons/license_cc.png differ
diff --git a/theme/lcd/icons/license_cc0.png b/theme/lcd/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/lcd/icons/license_cc0.png differ
diff --git a/theme/lcd/icons/license_fdl.png b/theme/lcd/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/lcd/icons/license_fdl.png differ
diff --git a/theme/lcd/icons/license_un.png b/theme/lcd/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/lcd/icons/license_un.png differ
diff --git a/theme/lcd/icons/license_wtf.png b/theme/lcd/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/lcd/icons/license_wtf.png differ
diff --git a/theme/light/icons/license_cc.png b/theme/light/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/light/icons/license_cc.png differ
diff --git a/theme/light/icons/license_cc0.png b/theme/light/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/light/icons/license_cc0.png differ
diff --git a/theme/light/icons/license_fdl.png b/theme/light/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/light/icons/license_fdl.png differ
diff --git a/theme/light/icons/license_un.png b/theme/light/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/light/icons/license_un.png differ
diff --git a/theme/light/icons/license_wtf.png b/theme/light/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/light/icons/license_wtf.png differ
diff --git a/theme/night/icons/license_cc.png b/theme/night/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/night/icons/license_cc.png differ
diff --git a/theme/night/icons/license_cc0.png b/theme/night/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/night/icons/license_cc0.png differ
diff --git a/theme/night/icons/license_fdl.png b/theme/night/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/night/icons/license_fdl.png differ
diff --git a/theme/night/icons/license_un.png b/theme/night/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/night/icons/license_un.png differ
diff --git a/theme/night/icons/license_wtf.png b/theme/night/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/night/icons/license_wtf.png differ
diff --git a/theme/pixel/icons/license_cc.png b/theme/pixel/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/pixel/icons/license_cc.png differ
diff --git a/theme/pixel/icons/license_cc0.png b/theme/pixel/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/pixel/icons/license_cc0.png differ
diff --git a/theme/pixel/icons/license_fdl.png b/theme/pixel/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/pixel/icons/license_fdl.png differ
diff --git a/theme/pixel/icons/license_un.png b/theme/pixel/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/pixel/icons/license_un.png differ
diff --git a/theme/pixel/icons/license_wtf.png b/theme/pixel/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/pixel/icons/license_wtf.png differ
diff --git a/theme/purple/icons/license_cc.png b/theme/purple/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/purple/icons/license_cc.png differ
diff --git a/theme/purple/icons/license_cc0.png b/theme/purple/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/purple/icons/license_cc0.png differ
diff --git a/theme/purple/icons/license_fdl.png b/theme/purple/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/purple/icons/license_fdl.png differ
diff --git a/theme/purple/icons/license_un.png b/theme/purple/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/purple/icons/license_un.png differ
diff --git a/theme/purple/icons/license_wtf.png b/theme/purple/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/purple/icons/license_wtf.png differ
diff --git a/theme/rc3/icons/license_cc.png b/theme/rc3/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/rc3/icons/license_cc.png differ
diff --git a/theme/rc3/icons/license_cc0.png b/theme/rc3/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/rc3/icons/license_cc0.png differ
diff --git a/theme/rc3/icons/license_fdl.png b/theme/rc3/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/rc3/icons/license_fdl.png differ
diff --git a/theme/rc3/icons/license_un.png b/theme/rc3/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/rc3/icons/license_un.png differ
diff --git a/theme/rc3/icons/license_wtf.png b/theme/rc3/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/rc3/icons/license_wtf.png differ
diff --git a/theme/solidaric/icons/license_cc.png b/theme/solidaric/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/solidaric/icons/license_cc.png differ
diff --git a/theme/solidaric/icons/license_cc0.png b/theme/solidaric/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/solidaric/icons/license_cc0.png differ
diff --git a/theme/solidaric/icons/license_fdl.png b/theme/solidaric/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/solidaric/icons/license_fdl.png differ
diff --git a/theme/solidaric/icons/license_un.png b/theme/solidaric/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/solidaric/icons/license_un.png differ
diff --git a/theme/solidaric/icons/license_wtf.png b/theme/solidaric/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/solidaric/icons/license_wtf.png differ
diff --git a/theme/starlight/icons/license_cc.png b/theme/starlight/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/starlight/icons/license_cc.png differ
diff --git a/theme/starlight/icons/license_cc0.png b/theme/starlight/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/starlight/icons/license_cc0.png differ
diff --git a/theme/starlight/icons/license_fdl.png b/theme/starlight/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/starlight/icons/license_fdl.png differ
diff --git a/theme/starlight/icons/license_un.png b/theme/starlight/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/starlight/icons/license_un.png differ
diff --git a/theme/starlight/icons/license_wtf.png b/theme/starlight/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/starlight/icons/license_wtf.png differ
diff --git a/theme/zen/icons/license_cc.png b/theme/zen/icons/license_cc.png
new file mode 100644
index 000000000..8066c9628
Binary files /dev/null and b/theme/zen/icons/license_cc.png differ
diff --git a/theme/zen/icons/license_cc0.png b/theme/zen/icons/license_cc0.png
new file mode 100644
index 000000000..f38297211
Binary files /dev/null and b/theme/zen/icons/license_cc0.png differ
diff --git a/theme/zen/icons/license_fdl.png b/theme/zen/icons/license_fdl.png
new file mode 100644
index 000000000..b650dffa2
Binary files /dev/null and b/theme/zen/icons/license_fdl.png differ
diff --git a/theme/zen/icons/license_un.png b/theme/zen/icons/license_un.png
new file mode 100644
index 000000000..01d37cee8
Binary files /dev/null and b/theme/zen/icons/license_un.png differ
diff --git a/theme/zen/icons/license_wtf.png b/theme/zen/icons/license_wtf.png
new file mode 100644
index 000000000..4ccb998e1
Binary files /dev/null and b/theme/zen/icons/license_wtf.png differ
diff --git a/utils.py b/utils.py
index dad2c098e..3b8751a05 100644
--- a/utils.py
+++ b/utils.py
@@ -4161,7 +4161,7 @@ def save_reverse_timeline(base_dir: str, reverse_sequence: []) -> []:
break
-def is_quote_toot(post_json_object: str) -> bool:
+def is_quote_toot(post_json_object: str, content: str) -> bool:
"""Returns true if the given post is a quote toot
"""
# Pleroma implementation
@@ -4187,6 +4187,9 @@ def is_quote_toot(post_json_object: str) -> bool:
if 'json' not in item['mediaType']:
continue
return True
+ if content:
+ if 'QT: ' in content:
+ return True
return False
diff --git a/webapp_post.py b/webapp_post.py
index 9d9a28184..100475b5e 100644
--- a/webapp_post.py
+++ b/webapp_post.py
@@ -1649,7 +1649,8 @@ def _get_footer_with_icons(show_icons: bool,
delete_str: str, mute_str: str, edit_str: str,
post_json_object: {}, published_link: str,
time_class: str, published_str: str,
- nickname: str, content_license_url: str) -> str:
+ nickname: str, content_license_url: str,
+ translate: {}) -> str:
"""Returns the html for a post footer containing icons
"""
if not show_icons:
@@ -1664,7 +1665,7 @@ def _get_footer_with_icons(show_icons: bool,
footer_str += ' '
if content_license_url:
footer_str += _get_copyright_footer(content_license_url,
- time_class)
+ translate)
# show the date
date_link = '/users/' + nickname + '?convthread=' + \
published_link.replace('/', '--')
@@ -1806,24 +1807,30 @@ def _get_content_license(post_json_object: {}) -> str:
def _get_copyright_footer(content_license_url: str,
- time_class: str) -> str:
+ translate: {}) -> str:
"""Returns the footer copyright link
"""
# show the CC symbol
- copyright_symbol = '🅭 '
+ icon_filename = 'license_cc.png'
if '/zero/' in content_license_url:
- copyright_symbol = '🄍 '
+ icon_filename = 'license_cc0.png'
elif 'unlicense' in content_license_url:
- copyright_symbol = '🅮'
+ icon_filename = 'license_un.png'
elif 'wtfpl' in content_license_url:
- copyright_symbol = '🅮'
+ icon_filename = 'license_wtf.png'
elif '/fdl' in content_license_url:
- copyright_symbol = '🄎'
- return '' + \
- '' + \
- copyright_symbol + ' '
+ icon_filename = 'license_fdl.png'
+
+ description = translate['Content License']
+ copyright_str = \
+ ' ' + \
+ '' + \
+ '![' + description + \
+ ' |](/icons/' + icon_filename + ' "' + \
+ description + '")
\n'
+
+ return copyright_str
def individual_post_as_html(signing_priv_key_pem: str,
@@ -2366,15 +2373,20 @@ def individual_post_as_html(signing_priv_key_pem: str,
content_license_url = _get_content_license(post_json_object)
if not is_news_post(post_json_object):
- footer_str = ''
+ if show_icons:
+ footer_str = ''
+ else:
+ footer_str = '\n'
if content_license_url:
footer_str += _get_copyright_footer(content_license_url,
- time_class)
+ translate)
conv_link = '/users/' + nickname + '?convthread=' + \
published_link.replace('/', '--')
footer_str += '
' + \
published_str + '\n'
+ if not show_icons:
+ footer_str += '
\n' + \
+ ' \n'
# show Approve and Deny buttons
follow_approvals_section += \