Tox address is 88AB9DED6F9FBEF43E105FB72060A2D89F9B93C74' + \ '4E8C45AB3C5E42C361C837155AFCFD9D448
' @@ -2092,7 +2110,7 @@ def testConstantTimeStringCheck(): avTime2 = ((end - start) * 1000000 / itterations) timeDiffMicroseconds = abs(avTime2 - avTime1) # time difference should be less than 10uS - assert timeDiffMicroseconds < 10 + assert int(timeDiffMicroseconds) < 10 # change multiple characters and observe timing difference start = time.time() @@ -2103,7 +2121,7 @@ def testConstantTimeStringCheck(): avTime2 = ((end - start) * 1000000 / itterations) timeDiffMicroseconds = abs(avTime2 - avTime1) # time difference should be less than 10uS - assert timeDiffMicroseconds < 10 + assert int(timeDiffMicroseconds) < 10 def testReplaceEmailQuote(): @@ -2173,8 +2191,156 @@ def testRemoveHtmlTag(): "src=\"https://somesiteorother.com/image.jpg\">" +def testHashtagRuleTree(): + print('testHashtagRuleTree') + operators = ('not', 'and', 'or', 'xor', 'from', 'contains') + + url = 'testsite.com' + moderated = True + conditionsStr = \ + 'contains "Cat" or contains "Corvid" or ' + \ + 'contains "Dormouse" or contains "Buzzard"' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == str(['or', ['contains', ['"Cat"']], + ['contains', ['"Corvid"']], + ['contains', ['"Dormouse"']], + ['contains', ['"Buzzard"']]]) + + content = 'This is a test' + moderated = True + conditionsStr = '#foo or #bar' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == str(['or', ['#foo'], ['#bar']]) + assert str(tagsInConditions) == str(['#foo', '#bar']) + hashtags = ['#foo'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#carrot', '#stick'] + assert not hashtagRuleResolve(tree, hashtags, moderated, content, url) + + content = 'This is a test' + url = 'https://testsite.com/something' + moderated = True + conditionsStr = '#foo and from "testsite.com"' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == str(['and', ['#foo'], ['from', ['"testsite.com"']]]) + assert str(tagsInConditions) == str(['#foo']) + hashtags = ['#foo'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + assert not hashtagRuleResolve(tree, hashtags, moderated, content, + 'othersite.net') + + content = 'This is a test' + moderated = True + conditionsStr = 'contains "is a" and #foo or #bar' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == \ + str(['and', ['contains', ['"is a"']], + ['or', ['#foo'], ['#bar']]]) + assert str(tagsInConditions) == str(['#foo', '#bar']) + hashtags = ['#foo'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#carrot', '#stick'] + assert not hashtagRuleResolve(tree, hashtags, moderated, content, url) + + moderated = False + conditionsStr = 'not moderated and #foo or #bar' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == \ + str(['not', ['and', ['moderated'], ['or', ['#foo'], ['#bar']]]]) + assert str(tagsInConditions) == str(['#foo', '#bar']) + hashtags = ['#foo'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#carrot', '#stick'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + + moderated = True + conditionsStr = 'moderated and #foo or #bar' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == \ + str(['and', ['moderated'], ['or', ['#foo'], ['#bar']]]) + assert str(tagsInConditions) == str(['#foo', '#bar']) + hashtags = ['#foo'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#carrot', '#stick'] + assert not hashtagRuleResolve(tree, hashtags, moderated, content, url) + + conditionsStr = 'x' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert tree is None + assert tagsInConditions == [] + hashtags = ['#foo'] + assert not hashtagRuleResolve(tree, hashtags, moderated, content, url) + + conditionsStr = '#x' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == str(['#x']) + assert str(tagsInConditions) == str(['#x']) + hashtags = ['#x'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#y', '#z'] + assert not hashtagRuleResolve(tree, hashtags, moderated, content, url) + + conditionsStr = 'not #b' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == str(['not', ['#b']]) + assert str(tagsInConditions) == str(['#b']) + hashtags = ['#y', '#z'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#a', '#b', '#c'] + assert not hashtagRuleResolve(tree, hashtags, moderated, content, url) + + conditionsStr = '#foo or #bar and #a' + tagsInConditions = [] + tree = hashtagRuleTree(operators, conditionsStr, + tagsInConditions, moderated) + assert str(tree) == str(['and', ['or', ['#foo'], ['#bar']], ['#a']]) + assert str(tagsInConditions) == str(['#foo', '#bar', '#a']) + hashtags = ['#foo', '#bar', '#a'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#bar', '#a'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#foo', '#a'] + assert hashtagRuleResolve(tree, hashtags, moderated, content, url) + hashtags = ['#x', '#a'] + assert not hashtagRuleResolve(tree, hashtags, moderated, content, url) + + +def testGetNewswireTags(): + print('testGetNewswireTags') + rssDescription = '
' + \
+ 'Compelling description with #ExcitingHashtag, which is ' + \
+ 'being posted in #BoringForum'
+ tags = getNewswireTags(rssDescription, 10)
+ assert len(tags) == 2
+ assert '#BoringForum' in tags
+ assert '#ExcitingHashtag' in tags
+
+
def runAllTests():
print('Running tests...')
+ testGetNewswireTags()
+ testHashtagRuleTree()
testRemoveHtmlTag()
testReplaceEmailQuote()
testConstantTimeStringCheck()
diff --git a/theme.py b/theme.py
index 8e5a59a10..a54bf0b13 100644
--- a/theme.py
+++ b/theme.py
@@ -25,8 +25,9 @@ def getThemesList() -> []:
and to lookup function names
"""
return ('Default', 'Blue', 'Hacker', 'Henge', 'HighVis',
- 'Indymedia', 'LCD', 'Light', 'Night', 'Purple',
- 'Solidaric', 'Starlight', 'Zen')
+ 'IndymediaClassic', 'IndymediaModern',
+ 'LCD', 'Light', 'Night', 'Purple', 'Solidaric',
+ 'Starlight', 'Zen')
def setThemeInConfig(baseDir: str, name: str) -> bool:
@@ -40,6 +41,74 @@ def setThemeInConfig(baseDir: str, name: str) -> bool:
return saveJson(configJson, configFilename)
+def setNewswirePublishAsIcon(baseDir: str, useIcon: bool) -> bool:
+ """Shows the newswire publish action as an icon or a button
+ """
+ configFilename = baseDir + '/config.json'
+ if not os.path.isfile(configFilename):
+ return False
+ configJson = loadJson(configFilename, 0)
+ if not configJson:
+ return False
+ configJson['showPublishAsIcon'] = useIcon
+ return saveJson(configJson, configFilename)
+
+
+def setIconsAsButtons(baseDir: str, useButtons: bool) -> bool:
+ """Whether to show icons in the header (inbox, outbox, etc)
+ as buttons
+ """
+ configFilename = baseDir + '/config.json'
+ if not os.path.isfile(configFilename):
+ return False
+ configJson = loadJson(configFilename, 0)
+ if not configJson:
+ return False
+ configJson['iconsAsButtons'] = useButtons
+ return saveJson(configJson, configFilename)
+
+
+def setRssIconAtTop(baseDir: str, atTop: bool) -> bool:
+ """Whether to show RSS icon at the top of the timeline
+ """
+ configFilename = baseDir + '/config.json'
+ if not os.path.isfile(configFilename):
+ return False
+ configJson = loadJson(configFilename, 0)
+ if not configJson:
+ return False
+ configJson['rssIconAtTop'] = atTop
+ return saveJson(configJson, configFilename)
+
+
+def setPublishButtonAtTop(baseDir: str, atTop: bool) -> bool:
+ """Whether to show the publish button above the title image
+ in the newswire column
+ """
+ configFilename = baseDir + '/config.json'
+ if not os.path.isfile(configFilename):
+ return False
+ configJson = loadJson(configFilename, 0)
+ if not configJson:
+ return False
+ configJson['publishButtonAtTop'] = atTop
+ return saveJson(configJson, configFilename)
+
+
+def setFullWidthTimelineButtonHeader(baseDir: str, fullWidth: bool) -> bool:
+ """Shows the timeline button header containing inbox, outbox,
+ calendar, etc as full width
+ """
+ configFilename = baseDir + '/config.json'
+ if not os.path.isfile(configFilename):
+ return False
+ configJson = loadJson(configFilename, 0)
+ if not configJson:
+ return False
+ configJson['fullWidthTimelineButtonHeader'] = fullWidth
+ return saveJson(configJson, configFilename)
+
+
def getTheme(baseDir: str) -> str:
configFilename = baseDir + '/config.json'
if os.path.isfile(configFilename):
@@ -231,6 +300,11 @@ def setThemeDefault(baseDir: str):
name = 'default'
removeTheme(baseDir)
setThemeInConfig(baseDir, name)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
bgParams = {
"login": "jpg",
"follow": "jpg",
@@ -238,15 +312,21 @@ def setThemeDefault(baseDir: str):
"search": "jpg"
}
themeParams = {
- "dummy": "1234"
+ "banner-height": "20vh",
+ "banner-height-mobile": "10vh"
}
setThemeFromDict(baseDir, name, themeParams, bgParams)
-def setThemeIndymedia(baseDir: str):
- name = 'indymedia'
+def setThemeIndymediaClassic(baseDir: str):
+ name = 'indymediaclassic'
removeTheme(baseDir)
setThemeInConfig(baseDir, name)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, True)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, False)
+ setPublishButtonAtTop(baseDir, False)
bgParams = {
"login": "jpg",
"follow": "jpg",
@@ -254,8 +334,11 @@ def setThemeIndymedia(baseDir: str):
"search": "jpg"
}
themeParams = {
+ "container-button-padding": "0px",
+ "hashtag-background-color": "darkred",
"font-size-newswire": "18px",
- "font-size-newswire-mobile": "48px",
+ "font-size-publish-button": "18px",
+ "font-size-newswire-mobile": "40px",
"line-spacing-newswire": "100%",
"newswire-item-moderated-color": "white",
"newswire-date-moderated-color": "white",
@@ -267,7 +350,7 @@ def setThemeIndymedia(baseDir: str):
"button-corner-radius": "5px",
"timeline-border-radius": "5px",
"focus-color": "blue",
- "font-size-button-mobile": "36px",
+ "font-size-button-mobile": "26px",
"font-size": "32px",
"font-size2": "26px",
"font-size3": "40px",
@@ -288,11 +371,13 @@ def setThemeIndymedia(baseDir: str):
"main-bg-color-dm": "#0b0a0a",
"border-color": "#003366",
"border-width": "0",
+ "border-width-header": "0",
"main-bg-color-reply": "#0f0d10",
"main-bg-color-report": "#0f0d10",
"hashtag-vertical-spacing3": "100px",
"hashtag-vertical-spacing4": "150px",
"button-background-hover": "darkblue",
+ "button-text-hover": "white",
"publish-button-background": "#ff9900",
"publish-button-text": "#003366",
"button-background": "#003366",
@@ -323,7 +408,14 @@ def setThemeBlue(baseDir: str):
name = 'blue'
removeTheme(baseDir)
setThemeInConfig(baseDir, name)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
themeParams = {
+ "banner-height": "20vh",
+ "banner-height-mobile": "10vh",
"newswire-date-color": "blue",
"font-size-header": "22px",
"font-size-header-mobile": "32px",
@@ -360,13 +452,21 @@ def setThemeNight(baseDir: str):
name = 'night'
removeTheme(baseDir)
setThemeInConfig(baseDir, name)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
fontStr = \
"url('./fonts/solidaric.woff2') format('woff2')"
fontStrItalic = \
"url('./fonts/solidaric-italic.woff2') format('woff2')"
themeParams = {
+ "column-left-header-background": "#07447c",
+ "banner-height": "15vh",
+ "banner-height-mobile": "10vh",
"focus-color": "blue",
- "font-size-button-mobile": "36px",
+ "font-size-button-mobile": "26px",
"font-size": "32px",
"font-size2": "26px",
"font-size3": "40px",
@@ -387,6 +487,7 @@ def setThemeNight(baseDir: str):
"hashtag-vertical-spacing3": "100px",
"hashtag-vertical-spacing4": "150px",
"button-background-hover": "#0481f5",
+ "button-text-hover": "#0f0d10",
"publish-button-background": "#07447c",
"button-background": "#07447c",
"button-selected": "#0481f5",
@@ -395,6 +496,8 @@ def setThemeNight(baseDir: str):
"day-number": "#a961ab",
"day-number2": "#555",
"time-color": "#a961ab",
+ "time-vertical-align": "-4px",
+ "time-vertical-align-mobile": "15px",
"place-color": "#a961ab",
"event-color": "#a961ab",
"event-background": "#333",
@@ -417,11 +520,17 @@ def setThemeStarlight(baseDir: str):
name = 'starlight'
removeTheme(baseDir)
setThemeInConfig(baseDir, name)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
themeParams = {
+ "column-left-header-background": "#69282c",
"column-left-image-width-mobile": "40vw",
"line-spacing-newswire": "120%",
"focus-color": "darkred",
- "font-size-button-mobile": "36px",
+ "font-size-button-mobile": "26px",
"font-size": "32px",
"font-size2": "26px",
"font-size3": "40px",
@@ -440,11 +549,13 @@ def setThemeStarlight(baseDir: str):
"main-bg-color-dm": "#0b0a0a",
"border-color": "#69282c",
"border-width": "3px",
+ "border-width-header": "3px",
"main-bg-color-reply": "#0f0d10",
"main-bg-color-report": "#0f0d10",
"hashtag-vertical-spacing3": "100px",
"hashtag-vertical-spacing4": "150px",
"button-background-hover": "#a9282c",
+ "button-text-hover": "#ffc4bc",
"publish-button-background": "#69282c",
"button-background": "#69282c",
"button-small-background": "darkblue",
@@ -482,10 +593,15 @@ def setThemeHenge(baseDir: str):
name = 'henge'
removeTheme(baseDir)
setThemeInConfig(baseDir, name)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
themeParams = {
"column-left-image-width-mobile": "40vw",
"column-right-image-width-mobile": "40vw",
- "font-size-button-mobile": "36px",
+ "font-size-button-mobile": "26px",
"font-size": "32px",
"font-size2": "26px",
"font-size3": "40px",
@@ -504,11 +620,13 @@ def setThemeHenge(baseDir: str):
"main-bg-color-dm": "#343335",
"border-color": "#222",
"border-width": "5px",
+ "border-width-header": "5px",
"main-bg-color-reply": "#383335",
"main-bg-color-report": "#383335",
"hashtag-vertical-spacing3": "100px",
"hashtag-vertical-spacing4": "150px",
"button-background-hover": "#444",
+ "button-text-hover": "white",
"publish-button-background": "#222",
"button-background": "#222",
"button-selected": "black",
@@ -542,7 +660,15 @@ def setThemeZen(baseDir: str):
name = 'zen'
removeTheme(baseDir)
setThemeInConfig(baseDir, name)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
themeParams = {
+ "banner-height": "25vh",
+ "banner-height-mobile": "10vh",
+ "newswire-date-color": "yellow",
"main-bg-color": "#5c4e41",
"column-left-color": "#5c4e41",
"text-entry-background": "#5c4e41",
@@ -552,6 +678,7 @@ def setThemeZen(baseDir: str):
"day-number2": "#5c4e41",
"border-color": "#463b35",
"border-width": "7px",
+ "border-width-header": "7px",
"main-link-color": "#dddddd",
"main-link-color-hover": "white",
"title-color": "#dddddd",
@@ -599,6 +726,11 @@ def setThemeHighVis(baseDir: str):
"search": "jpg"
}
setThemeFromDict(baseDir, name, themeParams, bgParams)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
def setThemeLCD(baseDir: str):
@@ -620,6 +752,7 @@ def setThemeLCD(baseDir: str):
"main-fg-color": "#33390d",
"border-color": "#33390d",
"border-width": "5px",
+ "border-width-header": "5px",
"main-link-color": "#9fb42b",
"main-link-color-hover": "#cfb42b",
"title-color": "#9fb42b",
@@ -627,10 +760,12 @@ def setThemeLCD(baseDir: str):
"button-selected": "black",
"button-highlighted": "green",
"button-background-hover": "#a3390d",
+ "button-text-hover": "#33390d",
"publish-button-background": "#33390d",
"button-background": "#33390d",
"button-small-background": "#33390d",
"button-text": "#9fb42b",
+ "button-selected-text": "#9fb42b",
"publish-button-text": "#9fb42b",
"button-small-text": "#9fb42b",
"color: #FFFFFE;": "color: #9fb42b;",
@@ -674,6 +809,11 @@ def setThemeLCD(baseDir: str):
"search": "jpg"
}
setThemeFromDict(baseDir, name, themeParams, bgParams)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
def setThemePurple(baseDir: str):
@@ -681,7 +821,7 @@ def setThemePurple(baseDir: str):
fontStr = \
"url('./fonts/CheGuevaraTextSans-Regular.woff2') format('woff2')"
themeParams = {
- "font-size-button-mobile": "36px",
+ "font-size-button-mobile": "26px",
"font-size": "32px",
"font-size2": "26px",
"font-size3": "40px",
@@ -702,10 +842,12 @@ def setThemePurple(baseDir: str):
"main-visited-color": "#f93bb0",
"button-selected": "#c042a0",
"button-background-hover": "#af42a0",
+ "button-text-hover": "#f98bb0",
"publish-button-background": "#ff42a0",
"button-background": "#ff42a0",
"button-small-background": "#ff42a0",
"button-text": "white",
+ "button-selected-text": "white",
"publish-button-text": "white",
"button-small-text": "white",
"color: #FFFFFE;": "color: #1f152d;",
@@ -733,6 +875,11 @@ def setThemePurple(baseDir: str):
"search": "jpg"
}
setThemeFromDict(baseDir, name, themeParams, bgParams)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
def setThemeHacker(baseDir: str):
@@ -755,10 +902,12 @@ def setThemeHacker(baseDir: str):
"main-visited-color": "#3c8234",
"button-selected": "#063200",
"button-background-hover": "#a62200",
+ "button-text-hover": "#00ff00",
"publish-button-background": "#062200",
"button-background": "#062200",
"button-small-background": "#062200",
"button-text": "#00ff00",
+ "button-selected-text": "#00ff00",
"publish-button-text": "#00ff00",
"button-small-text": "#00ff00",
"button-corner-radius": "4px",
@@ -789,13 +938,21 @@ def setThemeHacker(baseDir: str):
"search": "jpg"
}
setThemeFromDict(baseDir, name, themeParams, bgParams)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
def setThemeLight(baseDir: str):
name = 'light'
themeParams = {
+ "banner-height": "20vh",
+ "banner-height-mobile": "10vh",
+ "hashtag-background-color": "lightblue",
"focus-color": "grey",
- "font-size-button-mobile": "36px",
+ "font-size-button-mobile": "26px",
"font-size": "32px",
"font-size2": "26px",
"font-size3": "40px",
@@ -847,16 +1004,126 @@ def setThemeLight(baseDir: str):
"search": "jpg"
}
setThemeFromDict(baseDir, name, themeParams, bgParams)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
+
+
+def setThemeIndymediaModern(baseDir: str):
+ name = 'indymediamodern'
+ fontStr = \
+ "url('./fonts/NimbusSanL.otf') format('opentype')"
+ fontStrItalic = \
+ "url('./fonts/NimbusSanL-italic.otf') format('opentype')"
+ themeParams = {
+ "publish-button-vertical-offset": "10px",
+ "container-button-padding": "0px",
+ "container-button-margin": "0px",
+ "column-right-icon-size": "11%",
+ "button-height-padding": "5px",
+ "icon-brightness-change": "70%",
+ "border-width-header": "0px",
+ "tab-border-width": "3px",
+ "tab-border-color": "grey",
+ "button-corner-radius": "0px",
+ "login-button-color": "#25408f",
+ "login-button-fg-color": "white",
+ "column-left-width": "10vw",
+ "column-center-width": "70vw",
+ "column-right-width": "20vw",
+ "column-right-fg-color": "#25408f",
+ "column-right-fg-color-voted-on": "red",
+ "newswire-item-moderated-color": "red",
+ "newswire-date-moderated-color": "red",
+ "newswire-date-color": "grey",
+ "timeline-border-radius": "0px",
+ "button-background": "#767674",
+ "button-background-hover": "#555",
+ "button-text-hover": "white",
+ "button-selected": "white",
+ "button-selected-text": "black",
+ "button-text": "white",
+ "hashtag-fg-color": "white",
+ "publish-button-background": "#25408f",
+ "publish-button-text": "white",
+ "hashtag-background-color": "#b2b2b2",
+ "focus-color": "grey",
+ "font-size-button-mobile": "26px",
+ "font-size-publish-button": "26px",
+ "font-size": "32px",
+ "font-size2": "26px",
+ "font-size3": "40px",
+ "font-size4": "24px",
+ "font-size5": "22px",
+ "rgba(0, 0, 0, 0.5)": "rgba(0, 0, 0, 0.0)",
+ "column-left-color": "white",
+ "main-bg-color": "white",
+ "main-bg-color-dm": "white",
+ "link-bg-color": "white",
+ "main-bg-color-reply": "white",
+ "main-bg-color-report": "white",
+ "main-header-color-roles": "#ebebf0",
+ "main-fg-color": "black",
+ "column-left-fg-color": "#25408f",
+ "border-color": "#c0cdd9",
+ "main-link-color": "#25408f",
+ "main-link-color-hover": "#10408f",
+ "title-color": "#2a2c37",
+ "main-visited-color": "#25408f",
+ "text-entry-foreground": "#111",
+ "text-entry-background": "white",
+ "font-color-header": "black",
+ "dropdown-fg-color": "#222",
+ "dropdown-fg-color-hover": "#222",
+ "dropdown-bg-color": "#e6ebf0",
+ "dropdown-bg-color-hover": "lightblue",
+ "color: #FFFFFE;": "color: black;",
+ "calendar-bg-color": "#e6ebf0",
+ "lines-color": "darkblue",
+ "day-number": "black",
+ "day-number2": "#282c37",
+ "place-color": "black",
+ "event-color": "#282c37",
+ "today-foreground": "white",
+ "today-circle": "red",
+ "event-background": "lightblue",
+ "event-foreground": "white",
+ "title-text": "#282c37",
+ "title-background": "#ccc",
+ "gallery-text-color": "black",
+ "*font-family": "'NimbusSanL'",
+ "*src": fontStr,
+ "**src": fontStrItalic
+ }
+ bgParams = {
+ "login": "jpg",
+ "follow": "jpg",
+ "options": "jpg",
+ "search": "jpg"
+ }
+ setThemeFromDict(baseDir, name, themeParams, bgParams)
+ setNewswirePublishAsIcon(baseDir, False)
+ setFullWidthTimelineButtonHeader(baseDir, True)
+ setIconsAsButtons(baseDir, True)
+ setRssIconAtTop(baseDir, False)
+ setPublishButtonAtTop(baseDir, True)
def setThemeSolidaric(baseDir: str):
name = 'solidaric'
themeParams = {
+ "banner-height": "35vh",
+ "banner-height-mobile": "15vh",
+ "time-vertical-align": "-4px",
+ "time-vertical-align-mobile": "15px",
+ "hashtag-background-color": "lightred",
"button-highlighted": "darkred",
"button-selected-highlighted": "darkred",
"newswire-date-color": "grey",
"focus-color": "grey",
- "font-size-button-mobile": "36px",
+ "font-size-button-mobile": "26px",
"font-size": "32px",
"font-size2": "26px",
"font-size3": "40px",
@@ -911,6 +1178,11 @@ def setThemeSolidaric(baseDir: str):
"search": "jpg"
}
setThemeFromDict(baseDir, name, themeParams, bgParams)
+ setNewswirePublishAsIcon(baseDir, True)
+ setFullWidthTimelineButtonHeader(baseDir, False)
+ setIconsAsButtons(baseDir, False)
+ setRssIconAtTop(baseDir, True)
+ setPublishButtonAtTop(baseDir, False)
def setThemeImages(baseDir: str, name: str) -> None:
diff --git a/translations/ar.json b/translations/ar.json
index de49c1547..607b7ce40 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "علامات التجزئة المُنشأة تلقائيًا",
"Autogenerated Content Warnings": "تحذيرات المحتوى المُنشأ تلقائيًا",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag محظور",
"This is a blogging instance": "هذا مثال على المدونات",
"Edit Links": "تحرير الارتباطات",
@@ -311,5 +313,16 @@
"Site Editors": "محررو الموقع",
"Allow news posts": "السماح بنشر الأخبار",
"Publish": "ينشر",
- "Publish a news article": "انشر مقالة إخبارية"
+ "Publish a news article": "انشر مقالة إخبارية",
+ "News tagging rules": "قواعد وسم الأخبار",
+ "See instructions": "انظر التعليمات",
+ "Search": "بحث",
+ "Expand": "وسعت",
+ "Newswire": "نيوزواير",
+ "Links": "الروابط",
+ "Post": "بريد",
+ "User": "المستعمل",
+ "Features" : "ميزات",
+ "Article": "مقال إخباري",
+ "Create an article": "قم بإنشاء مقال"
}
diff --git a/translations/ca.json b/translations/ca.json
index 3499c9de7..0b0b702d1 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Hashtags autogenerats",
"Autogenerated Content Warnings": "Advertiments de contingut autogenerats",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag bloquejat",
"This is a blogging instance": "Aquesta és una instància de blocs",
"Edit Links": "Edita els enllaços",
@@ -311,5 +313,16 @@
"Site Editors": "Editors de llocs",
"Allow news posts": "Permet publicacions de notícies",
"Publish": "Publica",
- "Publish a news article": "Publicar un article de notícies"
+ "Publish a news article": "Publicar un article de notícies",
+ "News tagging rules": "Regles d'etiquetatge de notícies",
+ "See instructions": "Consulteu les instruccions",
+ "Search": "Cerca",
+ "Expand": "Amplia",
+ "Newswire": "Newswire",
+ "Links": "Enllaços",
+ "Post": "Publicació",
+ "User": "Usuari",
+ "Features" : "Article",
+ "Article": "Reportatge",
+ "Create an article": "Creeu un article"
}
diff --git a/translations/cy.json b/translations/cy.json
index 2ab1795cc..e4f548916 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Hashtags awtogeneiddiedig",
"Autogenerated Content Warnings": "Rhybuddion Cynnwys Autogenerated",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag wedi'i Blocio",
"This is a blogging instance": "Dyma enghraifft blogio",
"Edit Links": "Golygu Dolenni",
@@ -311,5 +313,16 @@
"Site Editors": "Golygyddion Safle",
"Allow news posts": "Caniatáu swyddi newyddion",
"Publish": "Cyhoeddi",
- "Publish a news article": "Cyhoeddi erthygl newyddion"
+ "Publish a news article": "Cyhoeddi erthygl newyddion",
+ "News tagging rules": "Rheolau tagio newyddion",
+ "See instructions": "Gweler y cyfarwyddiadau",
+ "Search": "Chwilio",
+ "Expand": "Ehangu",
+ "Newswire": "Newswire",
+ "Links": "Dolenni",
+ "Post": "Post",
+ "User": "Defnyddiwr",
+ "Features" : "Nodweddion",
+ "Article": "Erthygl",
+ "Create an article": "Creu erthygl"
}
diff --git a/translations/de.json b/translations/de.json
index ceb6179e6..c486d8444 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Automatisch generierte Hashtags",
"Autogenerated Content Warnings": "Warnungen vor automatisch generierten Inhalten",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag blockiert",
"This is a blogging instance": "Dies ist eine Blogging-Instanz",
"Edit Links": "Links bearbeiten",
@@ -311,5 +313,16 @@
"Site Editors": "Site-Editoren",
"Allow news posts": "Nachrichtenbeiträge zulassen",
"Publish": "Veröffentlichen",
- "Publish a news article": "Veröffentlichen Sie einen Nachrichtenartikel"
+ "Publish a news article": "Veröffentlichen Sie einen Nachrichtenartikel",
+ "News tagging rules": "Regeln für das Markieren von Nachrichten",
+ "See instructions": "Siehe Anweisungen",
+ "Search": "Suche",
+ "Expand": "Erweitern",
+ "Newswire": "Newswire",
+ "Links": "Links",
+ "Post": "Post",
+ "User": "Nutzerin",
+ "Features" : "Eigenschaften",
+ "Article": "Artikel",
+ "Create an article": "Erstellen Sie einen Artikel"
}
diff --git a/translations/en.json b/translations/en.json
index e5a65517c..2dcd54fda 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Autogenerated Hashtags",
"Autogenerated Content Warnings": "Autogenerated Content Warnings",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag Blocked",
"This is a blogging instance": "This is a blogging instance",
"Edit Links": "Edit Links",
@@ -295,7 +297,7 @@
"Right column image": "Right column image",
"RSS feed for this site": "RSS feed for this site",
"Edit newswire": "Edit newswire",
- "Add RSS feed links below.": "RSS feed links below. Add a * at the beginning or end to indicate that a feed should be moderated.",
+ "Add RSS feed links below.": "RSS feed links below. Add a * at the beginning or end to indicate that a feed should be moderated. Add a ! at the beginning or end to indicate that the feed content should be mirrored.",
"Newswire RSS Feed": "Newswire RSS Feed",
"Nicknames whose blog entries appear on the newswire.": "Nicknames whose blog entries appear on the newswire.",
"Posts to be approved": "Posts to be approved",
@@ -311,5 +313,16 @@
"Site Editors": "Site Editors",
"Allow news posts": "Allow news posts",
"Publish": "Publish",
- "Publish a news article": "Publish a news article"
+ "Publish a news article": "Publish a news article",
+ "News tagging rules": "News tagging rules",
+ "See instructions": "See instructions",
+ "Search": "Search",
+ "Expand": "Expand",
+ "Newswire": "Newswire",
+ "Links": "Links",
+ "Post": "Post",
+ "User": "User",
+ "Features" : "Features",
+ "Article": "Article",
+ "Create an article": "Create an article"
}
diff --git a/translations/es.json b/translations/es.json
index 32c7ac5f8..c3f84bda0 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Hashtags autogenerados",
"Autogenerated Content Warnings": "Advertencias de contenido generado automáticamente",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag bloqueada",
"This is a blogging instance": "Esta es una instancia de blogs",
"Edit Links": "Editar enlaces",
@@ -311,5 +313,16 @@
"Site Editors": "Editores del sitio",
"Allow news posts": "Permitir publicaciones de noticias",
"Publish": "Publicar",
- "Publish a news article": "Publica un artículo de noticias"
+ "Publish a news article": "Publica un artículo de noticias",
+ "News tagging rules": "Reglas de etiquetado de noticias",
+ "See instructions": "Vea las instrucciones",
+ "Search": "Buscar",
+ "Expand": "Expandir",
+ "Newswire": "Newswire",
+ "Links": "Enlaces",
+ "Post": "Enviar",
+ "User": "Usuaria",
+ "Features" : "Caracteristicas",
+ "Article": "Artículo",
+ "Create an article": "Crea un articulo"
}
diff --git a/translations/fr.json b/translations/fr.json
index 068971bde..bb897925f 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Hashtags générés automatiquement",
"Autogenerated Content Warnings": "Avertissements de contenu générés automatiquement",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag bloqué",
"This is a blogging instance": "Ceci est une instance de blog",
"Edit Links": "Modifier les liens",
@@ -311,5 +313,16 @@
"Site Editors": "Éditeurs du site",
"Allow news posts": "Autoriser les articles d'actualité",
"Publish": "Publier",
- "Publish a news article": "Publier un article de presse"
+ "Publish a news article": "Publier un article de presse",
+ "News tagging rules": "Règles de marquage des actualités",
+ "See instructions": "Voir les instructions",
+ "Search": "Chercher",
+ "Expand": "Développer",
+ "Newswire": "Newswire",
+ "Links": "Liens",
+ "Post": "Publier",
+ "User": "Utilisatrice",
+ "Features" : "Traits",
+ "Article": "Article",
+ "Create an article": "Créer un article"
}
diff --git a/translations/ga.json b/translations/ga.json
index 547f6b56a..5cd34c5f8 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Hashtags uathghinte",
"Autogenerated Content Warnings": "Rabhaidh Ábhar Uathghinte",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag Blocáilte",
"This is a blogging instance": "Seo sampla blagála",
"Edit Links": "Cuir Naisc in eagar",
@@ -311,5 +313,16 @@
"Site Editors": "Eagarthóirí Suímh",
"Allow news posts": "Ceadaigh poist nuachta",
"Publish": "Fhoilsiú",
- "Publish a news article": "Foilsigh alt nuachta"
+ "Publish a news article": "Foilsigh alt nuachta",
+ "News tagging rules": "Rialacha clibeála nuachta",
+ "See instructions": "Féach na treoracha",
+ "Search": "Cuardaigh",
+ "Expand": "Leathnaigh",
+ "Newswire": "Newswire",
+ "Links": "Naisc",
+ "Post": "Post",
+ "User": "Úsáideoir",
+ "Features" : "Gnéithe",
+ "Article": "Airteagal",
+ "Create an article": "Cruthaigh alt"
}
diff --git a/translations/hi.json b/translations/hi.json
index 758a933ab..a8736813f 100644
--- a/translations/hi.json
+++ b/translations/hi.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "ऑटोजेनरेटेड हैशटैग",
"Autogenerated Content Warnings": "स्वतः प्राप्त सामग्री चेतावनी",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "हैशटैग अवरुद्ध",
"This is a blogging instance": "यह एक ब्लॉगिंग उदाहरण है",
"Edit Links": "लिंक संपादित करें",
@@ -311,5 +313,16 @@
"Site Editors": "साइट संपादकों",
"Allow news posts": "समाचार पोस्ट की अनुमति दें",
"Publish": "प्रकाशित करना",
- "Publish a news article": "एक समाचार लेख प्रकाशित करें"
+ "Publish a news article": "एक समाचार लेख प्रकाशित करें",
+ "News tagging rules": "समाचार टैगिंग नियम",
+ "See instructions": "निर्देश देखें",
+ "Search": "खोज",
+ "Expand": "विस्तार",
+ "Newswire": "न्यूज़वायर",
+ "Links": "लिंक",
+ "Post": "पद",
+ "User": "उपयोगकर्ता",
+ "Features" : "विशेषताएं",
+ "Article": "लेख",
+ "Create an article": "एक लेख बनाएँ"
}
diff --git a/translations/it.json b/translations/it.json
index e103f50c9..834628eec 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Hashtag generati automaticamente",
"Autogenerated Content Warnings": "Avvisi sui contenuti generati automaticamente",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag bloccato",
"This is a blogging instance": "Questa è un'istanza di blog",
"Edit Links": "Modifica collegamenti",
@@ -311,5 +313,16 @@
"Site Editors": "Editori del sito",
"Allow news posts": "Consenti post di notizie",
"Publish": "Pubblicare",
- "Publish a news article": "Pubblica un articolo di notizie"
+ "Publish a news article": "Pubblica un articolo di notizie",
+ "News tagging rules": "Regole di tagging delle notizie",
+ "See instructions": "Vedere le istruzioni",
+ "Search": "Ricerca",
+ "Expand": "Espandere",
+ "Newswire": "Newswire",
+ "Links": "Collegamenti",
+ "Post": "Inviare",
+ "User": "Utente",
+ "Features" : "Caratteristiche",
+ "Article": "Articolo",
+ "Create an article": "Crea un articolo"
}
diff --git a/translations/ja.json b/translations/ja.json
index ac44cd3e0..1c85a5de3 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "自動生成されたハッシュタグ",
"Autogenerated Content Warnings": "自動生成されたコンテンツの警告",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "ハッシュタグがブロックされました",
"This is a blogging instance": "これはブログのインスタンスです",
"Edit Links": "リンクの編集",
@@ -311,5 +313,16 @@
"Site Editors": "サイト編集者",
"Allow news posts": "ニュース投稿を許可する",
"Publish": "公開する",
- "Publish a news article": "ニュース記事を公開する"
+ "Publish a news article": "ニュース記事を公開する",
+ "News tagging rules": "ニュースのタグ付けルール",
+ "See instructions": "手順を参照してください",
+ "Search": "探す",
+ "Expand": "展開",
+ "Newswire": "Newswire",
+ "Links": "リンク",
+ "Post": "役職",
+ "User": "ユーザー",
+ "Features" : "特徴",
+ "Article": "論文",
+ "Create an article": "記事を作成する"
}
diff --git a/translations/oc.json b/translations/oc.json
index 3e7c8007c..0586b23cd 100644
--- a/translations/oc.json
+++ b/translations/oc.json
@@ -283,6 +283,8 @@
"Autogenerated Hashtags": "Autogenerated Hashtags",
"Autogenerated Content Warnings": "Autogenerated Content Warnings",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag Blocked",
"This is a blogging instance": "This is a blogging instance",
"Edit Links": "Edit Links",
@@ -291,7 +293,7 @@
"Right column image": "Right column image",
"RSS feed for this site": "RSS feed for this site",
"Edit newswire": "Edit newswire",
- "Add RSS feed links below.": "RSS feed links below. Add a * at the beginning or end to indicate that a feed should be moderated.",
+ "Add RSS feed links below.": "RSS feed links below. Add a * at the beginning or end to indicate that a feed should be moderated. Add a ! at the beginning or end to indicate that the feed content should be mirrored.",
"Newswire RSS Feed": "Newswire RSS Feed",
"Nicknames whose blog entries appear on the newswire.": "Nicknames whose blog entries appear on the newswire.",
"Posts to be approved": "Posts to be approved",
@@ -307,5 +309,16 @@
"Site Editors": "Site Editors",
"Allow news posts": "Allow news posts",
"Publish": "Publish",
- "Publish a news article": "Publish a news article"
+ "Publish a news article": "Publish a news article",
+ "News tagging rules": "News tagging rules",
+ "See instructions": "See instructions",
+ "Search": "Search",
+ "Expand": "Expand",
+ "Newswire": "Newswire",
+ "Links": "Links",
+ "Post": "Post",
+ "User": "User",
+ "Features" : "Features",
+ "Article": "Article",
+ "Create an article": "Create an article"
}
diff --git a/translations/pt.json b/translations/pt.json
index a894c6c02..58e95a5bf 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Hashtags autogeradas",
"Autogenerated Content Warnings": "Avisos de conteúdo gerado automaticamente",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Hashtag bloqueada",
"This is a blogging instance": "Esta é uma instância de blog",
"Edit Links": "Editar Links",
@@ -311,5 +313,16 @@
"Site Editors": "Editores do site",
"Allow news posts": "Permitir postagens de notícias",
"Publish": "Publicar",
- "Publish a news article": "Publique um artigo de notícias"
+ "Publish a news article": "Publique um artigo de notícias",
+ "News tagging rules": "Regras de marcação de notícias",
+ "See instructions": "Veja as instruções",
+ "Search": "Pesquisa",
+ "Expand": "Expandir",
+ "Newswire": "Newswire",
+ "Links": "Links",
+ "Post": "Postar",
+ "User": "Do utilizador",
+ "Features" : "Recursos",
+ "Article": "Artigo",
+ "Create an article": "Crie um artigo"
}
diff --git a/translations/ru.json b/translations/ru.json
index 6ae4b03f5..75d6c4bd8 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "Автоматически сгенерированные хештеги",
"Autogenerated Content Warnings": "Автоматические предупреждения о содержании",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "Хештег заблокирован",
"This is a blogging instance": "Это экземпляр блога",
"Edit Links": "Редактировать ссылки",
@@ -311,5 +313,16 @@
"Site Editors": "Редакторы сайта",
"Allow news posts": "Разрешить публикации новостей",
"Publish": "Публиковать",
- "Publish a news article": "Опубликовать новостную статью"
+ "Publish a news article": "Опубликовать новостную статью",
+ "News tagging rules": "Правила тегирования новостей",
+ "See instructions": "См. Инструкции",
+ "Search": "Поиск",
+ "Expand": "Развернуть",
+ "Newswire": "Лента новостей",
+ "Links": "Ссылки",
+ "Post": "После",
+ "User": "Пользователь",
+ "Features" : "особенности",
+ "Article": "Статья",
+ "Create an article": "Создать статью"
}
diff --git a/translations/zh.json b/translations/zh.json
index d2a33c46b..b848bd20a 100644
--- a/translations/zh.json
+++ b/translations/zh.json
@@ -287,6 +287,8 @@
"Autogenerated Hashtags": "自动生成的标签",
"Autogenerated Content Warnings": "自动生成的内容警告",
"Indymedia": "Indymedia",
+ "IndymediaClassic": "Indymedia Classic",
+ "IndymediaModern": "Indymedia Modern",
"Hashtag Blocked": "标签被阻止",
"This is a blogging instance": "这是一个博客实例",
"Edit Links": "编辑连结",
@@ -311,5 +313,16 @@
"Site Editors": "网站编辑",
"Allow news posts": "允许新闻发布",
"Publish": "发布",
- "Publish a news article": "发布新闻文章"
+ "Publish a news article": "发布新闻文章",
+ "News tagging rules": "新闻标记规则",
+ "See instructions": "见说明",
+ "Search": "搜索",
+ "Expand": "扩大",
+ "Newswire": "新闻专线",
+ "Links": "链接",
+ "Post": "发布",
+ "User": "用户",
+ "Features" : "特征",
+ "Article": "文章",
+ "Create an article": "建立文章"
}
diff --git a/utils.py b/utils.py
index 6ed6c1c62..08d21f159 100644
--- a/utils.py
+++ b/utils.py
@@ -19,6 +19,25 @@ from calendar import monthrange
from followingCalendar import addPersonToCalendar
+def removeHtml(content: str) -> str:
+ """Removes html links from the given content.
+ Used to ensure that profile descriptions don't contain dubious content
+ """
+ if '<' not in content:
+ return content
+ removing = False
+ content = content.replace('', '"').replace('', '"') + result = '' + for ch in content: + if ch == '<': + removing = True + elif ch == '>': + removing = False + elif not removing: + result += ch + return result + + def isSystemAccount(nickname: str) -> bool: """Returns true if the given nickname is a system account """ @@ -587,6 +606,39 @@ def locateNewsArrival(baseDir: str, domain: str, return None +def clearFromPostCaches(baseDir: str, recentPostsCache: {}, + postId: str) -> None: + """Clears cached html for the given post, so that edits + to news will appear + """ + filename = '/postcache/' + postId + '.html' + for subdir, dirs, files in os.walk(baseDir + '/accounts'): + for acct in dirs: + if '@' not in acct: + continue + if 'inbox@' in acct: + continue + cacheDir = os.path.join(baseDir + '/accounts', acct) + postFilename = cacheDir + filename + if os.path.isfile(postFilename): + try: + os.remove(postFilename) + except BaseException: + print('WARN: clearFromPostCaches file not removed ' + + postFilename) + pass + # if the post is in the recent posts cache then remove it + if recentPostsCache.get('index'): + if postId in recentPostsCache['index']: + recentPostsCache['index'].remove(postId) + if recentPostsCache.get('json'): + if recentPostsCache['json'].get(postId): + del recentPostsCache['json'][postId] + if recentPostsCache.get('html'): + if recentPostsCache['html'].get(postId): + del recentPostsCache['html'][postId] + + def locatePost(baseDir: str, nickname: str, domain: str, postUrl: str, replies=False) -> str: """Returns the filename for the given status post url @@ -719,26 +771,21 @@ def deletePost(baseDir: str, httpPrefix: str, if recentPostsCache.get('index'): if postId in recentPostsCache['index']: recentPostsCache['index'].remove(postId) - if recentPostsCache['json'].get(postId): - del recentPostsCache['json'][postId] + if recentPostsCache.get('json'): + if recentPostsCache['json'].get(postId): + del recentPostsCache['json'][postId] + if recentPostsCache.get('html'): + if recentPostsCache['html'].get(postId): + del recentPostsCache['html'][postId] # remove any attachment removeAttachment(baseDir, httpPrefix, domain, postJsonObject) - # remove any mute file - muteFilename = postFilename + '.muted' - if os.path.isfile(muteFilename): - os.remove(muteFilename) - - # remove any votes file - votesFilename = postFilename + '.votes' - if os.path.isfile(votesFilename): - os.remove(votesFilename) - - # remove any arrived file - arrivedFilename = postFilename + '.arrived' - if os.path.isfile(arrivedFilename): - os.remove(arrivedFilename) + extensions = ('votes', 'arrived', 'muted') + for ext in extensions: + extFilename = postFilename + '.' + ext + if os.path.isfile(extFilename): + os.remove(extFilename) # remove cached html version of the post cachedPostFilename = \ @@ -1006,6 +1053,35 @@ def fileLastModified(filename: str) -> str: return modifiedTime.strftime("%Y-%m-%dT%H:%M:%SZ") +def getCSS(baseDir: str, cssFilename: str, cssCache: {}) -> str: + """Retrieves the css for a given file, or from a cache + """ + # does the css file exist? + if not os.path.isfile(cssFilename): + return None + + lastModified = fileLastModified(cssFilename) + + # has this already been loaded into the cache? + if cssCache.get(cssFilename): + if cssCache[cssFilename][0] == lastModified: + # file hasn't changed, so return the version in the cache + return cssCache[cssFilename][1] + + with open(cssFilename, 'r') as fpCSS: + css = fpCSS.read() + if cssCache.get(cssFilename): + # alter the cache contents + cssCache[cssFilename][0] = lastModified + cssCache[cssFilename][1] = css + else: + # add entry to the cache + cssCache[cssFilename] = [lastModified, css] + return css + + return None + + def daysInMonth(year: int, monthNumber: int) -> int: """Returns the number of days in the month """ diff --git a/webinterface.py b/webinterface.py index 14b4aa121..7e20bf4ff 100644 --- a/webinterface.py +++ b/webinterface.py @@ -25,6 +25,7 @@ from ssb import getSSBAddress from tox import getToxAddress from matrix import getMatrixAddress from donate import getDonationUrl +from utils import getCSS from utils import isSystemAccount from utils import removeIdEnding from utils import getProtocolPrefixes @@ -45,6 +46,7 @@ from utils import getCachedPostFilename from utils import loadJson from utils import getConfigParam from utils import votesOnNewswireItem +from utils import removeHtml from follow import isFollowingActor from webfinger import webfingerHandle from posts import isDM @@ -71,7 +73,6 @@ from content import getMentionsFromHtml from content import addHtmlTags from content import replaceEmojiFromTags from content import removeLongWords -from content import removeHtml from skills import getSkills from cache import getPersonFromCache from cache import storePersonInCache @@ -327,7 +328,8 @@ def getPersonAvatarUrl(baseDir: str, personUrl: str, personCache: {}, return None -def htmlFollowingList(baseDir: str, followingFilename: str) -> str: +def htmlFollowingList(cssCache: {}, baseDir: str, + followingFilename: str) -> str: """Returns a list of handles being followed """ with open(followingFilename, 'r') as followingFile: @@ -338,8 +340,9 @@ def htmlFollowingList(baseDir: str, followingFilename: str) -> str: cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - profileCSS = cssFile.read() + + profileCSS = getCSS(baseDir, cssFilename, cssCache) + if profileCSS: followingListHtml = htmlHeader(cssFilename, profileCSS) for followingAddress in followingList: if followingAddress: @@ -391,7 +394,8 @@ def htmlFollowingDataList(baseDir: str, nickname: str, return listStr -def htmlSearchEmoji(translate: {}, baseDir: str, httpPrefix: str, +def htmlSearchEmoji(cssCache: {}, translate: {}, + baseDir: str, httpPrefix: str, searchStr: str) -> str: """Search results for emoji """ @@ -405,8 +409,9 @@ def htmlSearchEmoji(translate: {}, baseDir: str, httpPrefix: str, cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - emojiCSS = cssFile.read() + + emojiCSS = getCSS(baseDir, cssFilename, cssCache) + if emojiCSS: if httpPrefix != 'https': emojiCSS = emojiCSS.replace('https://', httpPrefix + '://') @@ -465,7 +470,7 @@ def getIconsDir(baseDir: str) -> str: return iconsDir -def htmlSearchSharedItems(translate: {}, +def htmlSearchSharedItems(cssCache: {}, translate: {}, baseDir: str, searchStr: str, pageNumber: int, resultsPerPage: int, @@ -485,8 +490,8 @@ def htmlSearchSharedItems(translate: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - sharedItemsCSS = cssFile.read() + sharedItemsCSS = getCSS(baseDir, cssFilename, cssCache) + if sharedItemsCSS: if httpPrefix != 'https': sharedItemsCSS = \ sharedItemsCSS.replace('https://', @@ -640,7 +645,8 @@ def htmlSearchSharedItems(translate: {}, return sharedItemsForm -def htmlModerationInfo(translate: {}, baseDir: str, httpPrefix: str) -> str: +def htmlModerationInfo(cssCache: {}, translate: {}, + baseDir: str, httpPrefix: str) -> str: msgStr1 = \ 'These are globally blocked for all accounts on this instance' msgStr2 = \ @@ -649,8 +655,9 @@ def htmlModerationInfo(translate: {}, baseDir: str, httpPrefix: str) -> str: cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - infoCSS = cssFile.read() + + infoCSS = getCSS(baseDir, cssFilename, cssCache) + if infoCSS: if httpPrefix != 'https': infoCSS = infoCSS.replace('https://', httpPrefix + '://') @@ -704,7 +711,8 @@ def htmlModerationInfo(translate: {}, baseDir: str, httpPrefix: str) -> str: return infoForm -def htmlHashtagSearch(nickname: str, domain: str, port: int, +def htmlHashtagSearch(cssCache: {}, + nickname: str, domain: str, port: int, recentPostsCache: {}, maxRecentPosts: int, translate: {}, baseDir: str, hashtag: str, pageNumber: int, @@ -743,8 +751,9 @@ def htmlHashtagSearch(nickname: str, domain: str, port: int, cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - hashtagSearchCSS = cssFile.read() + + hashtagSearchCSS = getCSS(baseDir, cssFilename, cssCache) + if hashtagSearchCSS: if httpPrefix != 'https': hashtagSearchCSS = \ hashtagSearchCSS.replace('https://', @@ -979,7 +988,7 @@ def rssHashtagSearch(nickname: str, domain: str, port: int, return hashtagFeed + rss2TagFooter() -def htmlSkillsSearch(translate: {}, baseDir: str, +def htmlSkillsSearch(cssCache: {}, translate: {}, baseDir: str, httpPrefix: str, skillsearch: str, instanceOnly: bool, postsPerPage: int) -> str: @@ -1067,8 +1076,9 @@ def htmlSkillsSearch(translate: {}, baseDir: str, cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - skillSearchCSS = cssFile.read() + + skillSearchCSS = getCSS(baseDir, cssFilename, cssCache) + if skillSearchCSS: if httpPrefix != 'https': skillSearchCSS = \ skillSearchCSS.replace('https://', @@ -1107,7 +1117,7 @@ def htmlSkillsSearch(translate: {}, baseDir: str, return skillSearchForm -def htmlHistorySearch(translate: {}, baseDir: str, +def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str, httpPrefix: str, nickname: str, domain: str, historysearch: str, @@ -1135,8 +1145,9 @@ def htmlHistorySearch(translate: {}, baseDir: str, cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - historySearchCSS = cssFile.read() + + historySearchCSS = getCSS(baseDir, cssFilename, cssCache) + if historySearchCSS: if httpPrefix != 'https': historySearchCSS = \ historySearchCSS.replace('https://', @@ -1214,7 +1225,7 @@ def scheduledPostsExist(baseDir: str, nickname: str, domain: str) -> bool: return False -def htmlEditLinks(translate: {}, baseDir: str, path: str, +def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str, domain: str, port: int, httpPrefix: str) -> str: """Shows the edit links screen """ @@ -1235,8 +1246,9 @@ def htmlEditLinks(translate: {}, baseDir: str, path: str, cssFilename = baseDir + '/epicyon-links.css' if os.path.isfile(baseDir + '/links.css'): cssFilename = baseDir + '/links.css' - with open(cssFilename, 'r') as cssFile: - editCSS = cssFile.read() + + editCSS = getCSS(baseDir, cssFilename, cssCache) + if editCSS: if httpPrefix != 'https': editCSS = \ editCSS.replace('https://', httpPrefix + '://') @@ -1282,7 +1294,7 @@ def htmlEditLinks(translate: {}, baseDir: str, path: str, return editLinksForm -def htmlEditNewswire(translate: {}, baseDir: str, path: str, +def htmlEditNewswire(cssCache: {}, translate: {}, baseDir: str, path: str, domain: str, port: int, httpPrefix: str) -> str: """Shows the edit newswire screen """ @@ -1303,8 +1315,9 @@ def htmlEditNewswire(translate: {}, baseDir: str, path: str, cssFilename = baseDir + '/epicyon-links.css' if os.path.isfile(baseDir + '/links.css'): cssFilename = baseDir + '/links.css' - with open(cssFilename, 'r') as cssFile: - editCSS = cssFile.read() + + editCSS = getCSS(baseDir, cssFilename, cssCache) + if editCSS: if httpPrefix != 'https': editCSS = \ editCSS.replace('https://', httpPrefix + '://') @@ -1345,6 +1358,42 @@ def htmlEditNewswire(translate: {}, baseDir: str, path: str, ' ' + filterStr = '' + filterFilename = \ + baseDir + '/accounts/news@' + domain + '/filters.txt' + if os.path.isfile(filterFilename): + with open(filterFilename, 'r') as filterfile: + filterStr = filterfile.read() + + editNewswireForm += \ + '
\n' + editNewswireForm += '
' + editNewswireForm += ' \n' + + hashtagRulesStr = '' + hashtagRulesFilename = \ + baseDir + '/accounts/hashtagrules.txt' + if os.path.isfile(hashtagRulesFilename): + with open(hashtagRulesFilename, 'r') as rulesfile: + hashtagRulesStr = rulesfile.read() + + editNewswireForm += \ + '
\n' + editNewswireForm += '
\n' + editNewswireForm += \ + ' ' + translate['See instructions'] + '\n' + editNewswireForm += ' \n' + editNewswireForm += \ '' @@ -1352,7 +1401,7 @@ def htmlEditNewswire(translate: {}, baseDir: str, path: str, return editNewswireForm -def htmlEditNewsPost(translate: {}, baseDir: str, path: str, +def htmlEditNewsPost(cssCache: {}, translate: {}, baseDir: str, path: str, domain: str, port: int, httpPrefix: str, postUrl: str) -> str: """Edits a news post @@ -1380,8 +1429,9 @@ def htmlEditNewsPost(translate: {}, baseDir: str, path: str, cssFilename = baseDir + '/epicyon-links.css' if os.path.isfile(baseDir + '/links.css'): cssFilename = baseDir + '/links.css' - with open(cssFilename, 'r') as cssFile: - editCSS = cssFile.read() + + editCSS = getCSS(baseDir, cssFilename, cssCache) + if editCSS: if httpPrefix != 'https': editCSS = \ editCSS.replace('https://', httpPrefix + '://') @@ -1429,7 +1479,7 @@ def htmlEditNewsPost(translate: {}, baseDir: str, path: str, return editNewsPostForm -def htmlEditProfile(translate: {}, baseDir: str, path: str, +def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, domain: str, port: int, httpPrefix: str) -> str: """Shows the edit profile screen """ @@ -1616,8 +1666,9 @@ def htmlEditProfile(translate: {}, baseDir: str, path: str, cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - editProfileCSS = cssFile.read() + + editProfileCSS = getCSS(baseDir, cssFilename, cssCache) + if editProfileCSS: if httpPrefix != 'https': editProfileCSS = \ editProfileCSS.replace('https://', httpPrefix + '://') @@ -2059,7 +2110,8 @@ def htmlGetLoginCredentials(loginParams: str, return nickname, password, register -def htmlLogin(translate: {}, baseDir: str, autocomplete=True) -> str: +def htmlLogin(cssCache: {}, translate: {}, + baseDir: str, autocomplete=True) -> str: """Shows the login screen """ accounts = noOfAccounts(baseDir) @@ -2114,8 +2166,11 @@ def htmlLogin(translate: {}, baseDir: str, autocomplete=True) -> str: cssFilename = baseDir + '/epicyon-login.css' if os.path.isfile(baseDir + '/login.css'): cssFilename = baseDir + '/login.css' - with open(cssFilename, 'r') as cssFile: - loginCSS = cssFile.read() + + loginCSS = getCSS(baseDir, cssFilename, cssCache) + if not loginCSS: + print('ERROR: login css file missing ' + cssFilename) + return None # show the register button registerButtonStr = '' @@ -2182,7 +2237,8 @@ def htmlLogin(translate: {}, baseDir: str, autocomplete=True) -> str: return loginForm -def htmlTermsOfService(baseDir: str, httpPrefix: str, domainFull: str) -> str: +def htmlTermsOfService(cssCache: {}, baseDir: str, + httpPrefix: str, domainFull: str) -> str: """Show the terms of service screen """ adminNickname = getConfigParam(baseDir, 'admin') @@ -2204,8 +2260,9 @@ def htmlTermsOfService(baseDir: str, httpPrefix: str, domainFull: str) -> str: cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - termsCSS = cssFile.read() + + termsCSS = getCSS(baseDir, cssFilename, cssCache) + if termsCSS: if httpPrefix != 'https': termsCSS = termsCSS.replace('https://', httpPrefix+'://') @@ -2223,7 +2280,7 @@ def htmlTermsOfService(baseDir: str, httpPrefix: str, domainFull: str) -> str: return TOSForm -def htmlAbout(baseDir: str, httpPrefix: str, +def htmlAbout(cssCache: {}, baseDir: str, httpPrefix: str, domainFull: str, onionDomain: str) -> str: """Show the about screen """ @@ -2246,8 +2303,9 @@ def htmlAbout(baseDir: str, httpPrefix: str, cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - aboutCSS = cssFile.read() + + aboutCSS = getCSS(baseDir, cssFilename, cssCache) + if aboutCSS: if httpPrefix != 'http': aboutCSS = aboutCSS.replace('https://', httpPrefix + '://') @@ -2270,15 +2328,16 @@ def htmlAbout(baseDir: str, httpPrefix: str, return aboutForm -def htmlHashtagBlocked(baseDir: str, translate: {}) -> str: +def htmlHashtagBlocked(cssCache: {}, baseDir: str, translate: {}) -> str: """Show the screen for a blocked hashtag """ blockedHashtagForm = '' cssFilename = baseDir + '/epicyon-suspended.css' if os.path.isfile(baseDir + '/suspended.css'): cssFilename = baseDir + '/suspended.css' - with open(cssFilename, 'r') as cssFile: - blockedHashtagCSS = cssFile.read() + + blockedHashtagCSS = getCSS(baseDir, cssFilename, cssCache) + if blockedHashtagCSS: blockedHashtagForm = htmlHeader(cssFilename, blockedHashtagCSS) blockedHashtagForm += '
Account Suspended
\n' @@ -2310,13 +2370,14 @@ def htmlSuspended(baseDir: str) -> str: return suspendedForm -def htmlNewPost(mediaInstance: bool, translate: {}, +def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, baseDir: str, httpPrefix: str, path: str, inReplyTo: str, mentions: [], reportUrl: str, pageNumber: int, nickname: str, domain: str, - domainFull: str) -> str: + domainFull: str, + defaultTimeline: str) -> str: """New post screen """ iconsDir = getIconsDir(baseDir) @@ -2396,8 +2457,9 @@ def htmlNewPost(mediaInstance: bool, translate: {}, cssFilename = baseDir + '/epicyon-profile.css' if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - with open(cssFilename, 'r') as cssFile: - newPostCSS = cssFile.read() + + newPostCSS = getCSS(baseDir, cssFilename, cssCache) + if newPostCSS: if httpPrefix != 'https': newPostCSS = newPostCSS.replace('https://', httpPrefix + '://') @@ -2454,7 +2516,10 @@ def htmlNewPost(mediaInstance: bool, translate: {}, if path.endswith('/newblog'): placeholderSubject = translate['Title'] scopeIcon = 'scope_blog.png' - scopeDescription = translate['Blog'] + if defaultTimeline != 'tlnews': + scopeDescription = translate['Blog'] + else: + scopeDescription = translate['Article'] endpoint = 'newblog' elif path.endswith('/newunlisted'): scopeIcon = 'scope_unlisted.png' @@ -2767,12 +2832,20 @@ def htmlNewPost(mediaInstance: bool, translate: {}, iconsDir + '/scope_public.png"/>' + \ translate['Public'] + '' + \ translate['Visible to anyone'] + '\n' - dropDownContent += " " \ - '
' + \
- translate['Blog'] + '' + \ - translate['Publicly visible post'] + '
' + \
+ translate['Article'] + '' + \ + translate['Create an article'] + '
' + \
+ translate['Blog'] + '' + \ + translate['Publicly visible post'] + '
\n'
+ newPostForm += '
\n'
newPostForm += '
| ' + dropDownContent + ' | \n' newPostForm += \ @@ -3225,7 +3298,9 @@ def htmlSharesTimeline(translate: {}, pageNumber: int, itemsPerPage: int, return timelineStr -def htmlProfile(defaultTimeline: str, +def htmlProfile(rssIconAtTop: bool, + cssCache: {}, iconsAsButtons: bool, + defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, projectVersion: str, baseDir: str, httpPrefix: str, authorized: bool, @@ -3331,18 +3406,25 @@ def htmlProfile(defaultTimeline: str, donateSection += ' \n' donateSection += '\n' + iconsDir = getIconsDir(baseDir) if not authorized: - loginButton = \ - '
![| ' + translate['Edit'] + '](/' + iconsDir + \
+ '/edit.png "' + translate['Edit'] + \
+ '")
![| ' + translate['Logout'] + \
+ '](/' + iconsDir + \
+ '/logout.png "' + translate['Logout'] + \
+ '")