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

Confirm function naming convention

merge-requests/30/head
Bob Mottram 2020-11-28 10:45:26 +00:00
parent ac047e0b9c
commit 8638369962
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
daemon.py
View File

@ -120,8 +120,8 @@ from webapp_calendar import htmlCalendar
from webapp_about import htmlAbout from webapp_about import htmlAbout
from webapp_confirm import htmlConfirmDelete from webapp_confirm import htmlConfirmDelete
from webapp import htmlFollowingList from webapp import htmlFollowingList
from webapp_confirm import htmlRemoveSharedItem from webapp_confirm import htmlConfirmRemoveSharedItem
from webapp_confirm import htmlUnblockConfirm from webapp_confirm import htmlConfirmUnblock
from webapp_person_options import htmlPersonOptions from webapp_person_options import htmlPersonOptions
from webapp_timeline import htmlShares from webapp_timeline import htmlShares
from webapp_timeline import htmlInbox from webapp_timeline import htmlInbox
@ -141,8 +141,8 @@ from webapp_login import htmlLogin
from webapp_login import htmlGetLoginCredentials from webapp_login import htmlGetLoginCredentials
from webapp_suspended import htmlSuspended from webapp_suspended import htmlSuspended
from webapp_tos import htmlTermsOfService from webapp_tos import htmlTermsOfService
from webapp_confirm import htmlFollowConfirm from webapp_confirm import htmlConfirmFollow
from webapp_confirm import htmlUnfollowConfirm from webapp_confirm import htmlConfirmUnfollow
from webapp import htmlHashtagBlocked from webapp import htmlHashtagBlocked
from webapp_post import htmlPostReplies from webapp_post import htmlPostReplies
from webapp_post import htmlIndividualPost from webapp_post import htmlIndividualPost
@ -1790,7 +1790,7 @@ class PubServer(BaseHTTPRequestHandler):
if debug: if debug:
print('Unblocking ' + optionsActor) print('Unblocking ' + optionsActor)
msg = \ msg = \
htmlUnblockConfirm(self.server.cssCache, htmlConfirmUnblock(self.server.cssCache,
self.server.translate, self.server.translate,
baseDir, baseDir,
usersPath, usersPath,
@ -1808,7 +1808,7 @@ class PubServer(BaseHTTPRequestHandler):
if debug: if debug:
print('Following ' + optionsActor) print('Following ' + optionsActor)
msg = \ msg = \
htmlFollowConfirm(self.server.cssCache, htmlConfirmFollow(self.server.cssCache,
self.server.translate, self.server.translate,
baseDir, baseDir,
usersPath, usersPath,
@ -1825,7 +1825,7 @@ class PubServer(BaseHTTPRequestHandler):
if '&submitUnfollow=' in optionsConfirmParams: if '&submitUnfollow=' in optionsConfirmParams:
print('Unfollowing ' + optionsActor) print('Unfollowing ' + optionsActor)
msg = \ msg = \
htmlUnfollowConfirm(self.server.cssCache, htmlConfirmUnfollow(self.server.cssCache,
self.server.translate, self.server.translate,
baseDir, baseDir,
usersPath, usersPath,
@ -9318,11 +9318,11 @@ class PubServer(BaseHTTPRequestHandler):
actor = \ actor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
self.server.domainFull + usersPath self.server.domainFull + usersPath
msg = htmlRemoveSharedItem(self.server.cssCache, msg = htmlConfirmRemoveSharedItem(self.server.cssCache,
self.server.translate, self.server.translate,
self.server.baseDir, self.server.baseDir,
actor, shareName, actor, shareName,
callingDomain).encode('utf-8') callingDomain).encode('utf-8')
if not msg: if not msg:
if callingDomain.endswith('.onion') and \ if callingDomain.endswith('.onion') and \
self.server.onionDomain: self.server.onionDomain:

12
webapp_confirm.py
View File

@ -97,9 +97,9 @@ def htmlConfirmDelete(cssCache: {},
return deletePostStr return deletePostStr
def htmlRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str, def htmlConfirmRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str,
actor: str, shareName: str, actor: str, shareName: str,
callingDomain: str) -> str: callingDomain: str) -> str:
"""Shows a screen asking to confirm the removal of a shared item """Shows a screen asking to confirm the removal of a shared item
""" """
itemID = getValidSharedItemID(shareName) itemID = getValidSharedItemID(shareName)
@ -165,7 +165,7 @@ def htmlRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str,
return sharesStr return sharesStr
def htmlFollowConfirm(cssCache: {}, translate: {}, baseDir: str, def htmlConfirmFollow(cssCache: {}, translate: {}, baseDir: str,
originPathStr: str, originPathStr: str,
followActor: str, followActor: str,
followProfileUrl: str) -> str: followProfileUrl: str) -> str:
@ -209,7 +209,7 @@ def htmlFollowConfirm(cssCache: {}, translate: {}, baseDir: str,
return followStr return followStr
def htmlUnfollowConfirm(cssCache: {}, translate: {}, baseDir: str, def htmlConfirmUnfollow(cssCache: {}, translate: {}, baseDir: str,
originPathStr: str, originPathStr: str,
followActor: str, followActor: str,
followProfileUrl: str) -> str: followProfileUrl: str) -> str:
@ -254,7 +254,7 @@ def htmlUnfollowConfirm(cssCache: {}, translate: {}, baseDir: str,
return followStr return followStr
def htmlUnblockConfirm(cssCache: {}, translate: {}, baseDir: str, def htmlConfirmUnblock(cssCache: {}, translate: {}, baseDir: str,
originPathStr: str, originPathStr: str,
blockActor: str, blockActor: str,
blockProfileUrl: str) -> str: blockProfileUrl: str) -> str: