indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2022-12-18 09:44:11 +00:00
parent 6ed1c77158
commit 9d2c831c15
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon.py
View File

@ -176,6 +176,7 @@ from webapp_podcast import html_podcast_episode
from webapp_theme_designer import html_theme_designer from webapp_theme_designer import html_theme_designer
from webapp_minimalbutton import set_minimal from webapp_minimalbutton import set_minimal
from webapp_minimalbutton import is_minimal from webapp_minimalbutton import is_minimal
from webapp_utils import get_default_path
from webapp_utils import get_avatar_image_url from webapp_utils import get_avatar_image_url
from webapp_utils import html_hashtag_blocked from webapp_utils import html_hashtag_blocked
from webapp_utils import html_following_list from webapp_utils import html_following_list
@ -18225,16 +18226,9 @@ class PubServer(BaseHTTPRequestHandler):
self.server.domain, nickname) self.server.domain, nickname)
set_minimal(self.server.base_dir, set_minimal(self.server.base_dir,
self.server.domain, nickname, not_min) self.server.domain, nickname, not_min)
if not (self.server.media_instance or self.path = get_default_path(self.server.media_instance,
self.server.blogs_instance): self.server.blogs_instance,
self.path = '/users/' + nickname + '/inbox' nickname)
else:
if self.server.blogs_instance:
self.path = '/users/' + nickname + '/tlblogs'
elif self.server.media_instance:
self.path = '/users/' + nickname + '/tlmedia'
else:
self.path = '/users/' + nickname + '/tlfeatures'
# search for a fediverse address, shared item or emoji # search for a fediverse address, shared item or emoji
# from the web interface by selecting search icon # from the web interface by selecting search icon

13
webapp_utils.py
View File

@ -1953,3 +1953,16 @@ def language_right_to_left(language: str) -> bool:
if language in rtl_languages: if language in rtl_languages:
return True return True
return False return False
def get_default_path(media_instance: bool, blogs_instance: bool,
nickname: str) -> str:
"""Returns the default timeline
"""
if blogs_instance:
path = '/users/' + nickname + '/tlblogs'
elif media_instance:
path = '/users/' + nickname + '/tlmedia'
else:
path = '/users/' + nickname + '/inbox'
return path