Merge branch 'master' of https://notabug.org/jyamihud/FreeCompetitors

apps/brave.json

@@ -0,0 +1,20 @@
+{"names":["Brave"],
+ "comment":"Browser which markets itself over good privacy and addblocker by default.",
+ "links":{"website":"https://brave.com/",
+	  "wikipedia":"https://en.wikipedia.org/wiki/Brave_(web_browser)",
+	  "git":"https://github.com/brave/brave-browser",
+	  "icon":"https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fcryptoradar.org%2Fwp-content%2Fuploads%2F2019%2F08%2FBrave-logo.png&f=1&nofb=1"},
+ "licenses":["MPL-2.0"],
+ "platforms":["Android",
+	      "Windows",
+	      "MacOS",
+	      "iOS",
+	      "Linux"],
+ "interface":["Touch",
+	      "JavaScript"],
+ "languages":["JavaScript"],
+ "networks_read":[],
+ "networks_write":[],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Browser"]}

apps/firefox.json

@@ -0,0 +1,20 @@
+{"names":["Firefox"],
+ "comment":"Mozilla Firefox, or simply Firefox, is a free and open-source web browser developed by the Mozilla Corporation.",
+ "links":{"website":"https://mozilla.org/",
+	  "wikipedia":"https://en.wikipedia.org/wiki/Firefox",
+	  "git":"https://github.com/brave/brave-browser",
+	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Firefox_logo%2C_2019.svg/800px-Firefox_logo%2C_2019.svg.png"},
+ "licenses":["MPL-2.0"],
+ "platforms":["Android",
+	      "Windows",
+	      "MacOS",
+	      "iOS",
+	      "Linux"],
+ "interface":["Touch",
+	      "JavaScript"],
+ "languages":["JavaScript"],
+ "networks_read":[],
+ "networks_write":[],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Browser"]}

apps/lyberry.json

@@ -0,0 +1,16 @@
+{"names":["Lyberry"],
+ "comment":"A Qt LBRY client that uses the LyBerry Api",
+ "links":{"website":"https://proxitok.herokuapp.com/",
+	  "git":"https://git.tristans.cloud/tristan/lyberry_qt",
+	  "icon":"https://player.odycdn.com/api/v4/streams/free/lyberry.png/7b5db9118ba7414de212fdcdca24f69ba8adc429/8588b0"},
+ "licenses":["AGPL-3.0"],
+ "platforms":["Web"],
+ "interface":["QT"],
+ "languages":["python"],
+ "networks_read":["LBRY"],
+ "networks_write":["LBRY"],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["LBRY Client",
+		 "File Sharing",
+		 "Social Network"]}

apps/nitter.json

@@ -0,0 +1,18 @@
+{"names":["Nitter"],
+ "comment":"Free and open source alternative Twitter front-end focused on privacy and performance.",
+ "links":{"website":"https://nitter.net/",
+	  "git":"https://github.com/zedeus/nitter",
+	  "documentation":"https://github.com/zedeus/nitter/wiki",
+	  "icon":"https://nitter.net/logo.png"},
+ "licenses":["AGPL-3.0"],
+ "platforms":["Web"],
+ "interface":["Touch",
+	      "HTML"],
+ "languages":["Nim"],
+ "networks_read":["Twitter"],
+ "networks_write":[],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Twitter Client",
+		 "Image Sharing",
+		 "Social Network"]}

apps/palemoon.json

@@ -0,0 +1,17 @@
+{"names":["Palemoon"],
+ "comment":"Pale Moon is an open-source web browser with an emphasis on cusomizability; its moto is 'Your browser, Your way'.",
+ "links":{"website":"http://www.palemoon.org/",
+	  "wikipedia":"https://en.wikipedia.org/wiki/Pale_Moon",
+	  "git":"https://repo.palemoon.org/MoonchildProductions/Pale-Moon",
+	  "icon":"https://upload.wikimedia.org/wikipedia/en/a/a2/Pale_Moon_browser_icon.png"},
+ "licenses":["MPL-2.0"],
+ "platforms":["Windows",
+	      "Linux"],
+ "interface":["Touch",
+	      "JavaScript"],
+ "languages":["JavaScript"],
+ "networks_read":[],
+ "networks_write":[],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Browser"]}

apps/proxitok.json

@@ -0,0 +1,19 @@
+{"names":["ProxiTok"],
+ "comment":"Use Tiktok with an alternative frontend.",
+ "links":{"website":"https://proxitok.herokuapp.com/",
+	  "git":"https://github.com/pablouser1/ProxiTok",
+	  "documentation":"https://github.com/pablouser1/ProxiTok/wiki",
+	  "icon":"https://avatars.githubusercontent.com/u/17802865?s=120&v=4"},
+ "licenses":["AGPL-3.0"],
+ "platforms":["Web"],
+ "interface":["Touch",
+	      "HTML"],
+ "languages":["Latte",
+	      "PHP"],
+ "networks_read":["Twitter"],
+ "networks_write":[],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["TikTok Client",
+		 "Image Sharing",
+		 "Social Network"]}

modules/render.py

@@ -24,9 +24,13 @@ def html(page, json):
         
     # Few words about it
     comment = json.get("comment","")
-    if "open source" in comment.lower():
+    not_foss = ['open source', 'open-source']
+    if "open source" or "open-source" in comment.lower():
         # Well... Here is a thing. Free Software, not open source.
         where = comment.lower().find("open source")
+        # In case it has a slash in it.
+        if where == -1:
+            where = comment.lower().find("open-source")
         os = comment[where:where+11]
         comment = comment.replace(os,
         "<a href=\"https://www.gnu.org/philosophy/open-source-misses-the-point.en.html\">"+os+"</a>")