From 528917e9b108c179ca8b7b93b73f5ea3a9b66b02 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:29:58 +0200 Subject: [PATCH 01/33] Update copyright year/link --- templates/tox/add_ui.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/add_ui.html b/templates/tox/add_ui.html index b9f94f2..2119f4d 100644 --- a/templates/tox/add_ui.html +++ b/templates/tox/add_ui.html @@ -47,8 +47,8 @@ From f63f53596ac16588c2c12b1c60660cb5194f140f Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:30:57 +0200 Subject: [PATCH 02/33] Update addkeyweb_success.html --- templates/tox/addkeyweb_success.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/addkeyweb_success.html b/templates/tox/addkeyweb_success.html index c1fff36..0190549 100644 --- a/templates/tox/addkeyweb_success.html +++ b/templates/tox/addkeyweb_success.html @@ -20,8 +20,8 @@ From 9bdcf8551f5228501b253f27cd21c00b88c90e28 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:31:20 +0200 Subject: [PATCH 03/33] Update api_error_pretty.html --- templates/tox/api_error_pretty.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/api_error_pretty.html b/templates/tox/api_error_pretty.html index 4aeab2a..680c65b 100644 --- a/templates/tox/api_error_pretty.html +++ b/templates/tox/api_error_pretty.html @@ -20,8 +20,8 @@ From f00a333ed105b27a3ecfcec591fb1c23e885cab6 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:31:35 +0200 Subject: [PATCH 04/33] Update edit_ui.html --- templates/tox/edit_ui.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/edit_ui.html b/templates/tox/edit_ui.html index a7cf098..09c0a7a 100644 --- a/templates/tox/edit_ui.html +++ b/templates/tox/edit_ui.html @@ -51,8 +51,8 @@ From 2f98596b23c6baa369b889f349138e3633104693 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:31:50 +0200 Subject: [PATCH 05/33] Update fourohfour.html --- templates/tox/fourohfour.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/fourohfour.html b/templates/tox/fourohfour.html index dd4f6d7..05956b5 100644 --- a/templates/tox/fourohfour.html +++ b/templates/tox/fourohfour.html @@ -24,8 +24,8 @@ From c10ea9291d1718886ca2092467836cad28e04951 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:32:31 +0200 Subject: [PATCH 06/33] Update lookup_home.html --- templates/tox/lookup_home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index 6c033f0..c57b96a 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -42,8 +42,8 @@ From 278e06fda29207638e19681e4baf70889682df69 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:33:09 +0200 Subject: [PATCH 07/33] Update onemomentplease.html --- templates/tox/onemomentplease.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/tox/onemomentplease.html b/templates/tox/onemomentplease.html index 8c371e4..d0d8270 100644 --- a/templates/tox/onemomentplease.html +++ b/templates/tox/onemomentplease.html @@ -42,8 +42,9 @@ From e527bb4f5aff928f89c27af8393b2006200f78c0 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 25 Apr 2016 20:33:28 +0200 Subject: [PATCH 08/33] Update public_userlist.html --- templates/tox/public_userlist.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/public_userlist.html b/templates/tox/public_userlist.html index 94bdc1c..f8f9f50 100644 --- a/templates/tox/public_userlist.html +++ b/templates/tox/public_userlist.html @@ -50,8 +50,8 @@ From b653cf72f55f46118b7f37240133fbe165903016 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Wed, 11 May 2016 23:18:36 +0200 Subject: [PATCH 09/33] Get rid of some crawlers --- static/robots.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 static/robots.txt diff --git a/static/robots.txt b/static/robots.txt new file mode 100644 index 0000000..fdd0588 --- /dev/null +++ b/static/robots.txt @@ -0,0 +1,2 @@ +User-agent: spbot +Disallow: / From 2b2e9f2e2b5f4d4384996ee435ac0ff0e46e4674 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Wed, 11 May 2016 23:20:15 +0200 Subject: [PATCH 10/33] Add the robots.txt file to be served as a static file --- src/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index fcd88ee..9c3fbaa 100755 --- a/src/main.py +++ b/src/main.py @@ -859,12 +859,14 @@ def main(): LOGGER.info("Record sign key: {0}".format(crypto_core.verify_key)) templates_dir = "../templates/" + cfg["templates"] + robots_path=os.path.join(os.path.dirname(__file__), "../static") handlers = [ ("/api", _make_handler_for_api_method), ("/pk", PublicKey), (r"/barcode/(.+)\.svg$", CreateQR), (r"/u/(.+)?$", LookupAndOpenUser), - (r"^/$", LookupAndOpenUser) + (r"^/$", LookupAndOpenUser), + (r'/robots.txt', tornado.web.StaticFileHandler, {'path': robots_path}) ] if cfg["findfriends_enabled"]: handlers.append((r"/friends/([0-9]+)$", FindFriends)) From 140f9641ce83e7ebdcc1c0dae73bccb20bb22068 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Sun, 3 Jul 2016 10:35:55 +0200 Subject: [PATCH 11/33] Also delete item from cache... ... to prevent nonexistant records from showing up and blocking addition of a user. --- src/database.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/database.py b/src/database.py index 396916c..51fb087 100644 --- a/src/database.py +++ b/src/database.py @@ -250,6 +250,8 @@ def search_users(self, name, length, num): def delete_pk(self, pk): sess = self.gs() + ex = sess.query(User).filter_by(public_key=pk).first() + self.presence_cache[ex.name] = -1 sess.query(User).filter_by(public_key=pk).delete() sess.commit() sess.close() From 3c7fa35e9f51c2bc0d3791d6a8f39d4c1618faf3 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Fri, 8 Jul 2016 21:31:14 +0200 Subject: [PATCH 12/33] Switch original link. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6098e84..5a403be 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Install homebrew from http://brew.sh ```bash brew install libsodium python3 git libffi -git clone https://github.com/subliun/toxme +git clone https://github.com/LittleVulpix/toxme pip install -r misc/requirements.txt ``` @@ -30,7 +30,7 @@ cd libsodium* make -j4 && make install cd .. && rm -rf libsodium* cd ~ -git clone https://github.com/subliun/toxme +git clone https://github.com/LittleVulpix/toxme pip install -r misc/requirements.txt ``` From 3540ae4934847830cf00e4d5fd6652fead52a4b6 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Thu, 21 Jul 2016 20:10:45 +0200 Subject: [PATCH 13/33] Disallow crawling of specific users, allow root Only allow root to be crawled. --- static/robots.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/robots.txt b/static/robots.txt index fdd0588..e223f09 100644 --- a/static/robots.txt +++ b/static/robots.txt @@ -1,2 +1,3 @@ -User-agent: spbot +User-agent: * +Allow: /$ Disallow: / From 08e5d3db84e6da4ab48256e9e240aee9efc73483 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Thu, 21 Jul 2016 20:35:37 +0200 Subject: [PATCH 14/33] Add a way to contact me This is mostly for people who have some kind of request related to having their old account removed after they forgot the password. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 5a403be..a49a5ab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +##You can contact the maintainer of the toxme.io freenode IRC, channel #tox. + +I can assist you with removing or changing your user account on toxme.io in the event that you forget your toxme.io-generated password. + +However, please note that you need to be able to prove the account in question is yours. This means that you need to have access to your old toxid. + #ToxMe source ToxMe is a speedy and feature-packed Tox name resolution server. From 8e7a2352e2f0fca83144a5d5cb75554f89f73c84 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 29 Aug 2016 10:14:30 +0200 Subject: [PATCH 15/33] Add a more apparent way of contacting me This is for people who want to change their account but don't remember their password. Note that you will always need to be able to prove the account you want to modify is yours. In case of losing the toxme.io password, this means you must be able to log into this account and add me from it. --- templates/tox/lookup_home.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index c57b96a..d658d7a 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -26,6 +26,7 @@

Don't know anyone? Find some friends here.

+

Contact the maintainer - toxmeio@toxme.io

From cc3dae90c55fb76f745e8bfca2a34f1549495d29 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Mon, 12 Sep 2016 18:49:40 +0200 Subject: [PATCH 16/33] Modify the way of contacting me, add tox contact --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a49a5ab..c8d44f6 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,13 @@ -##You can contact the maintainer of the toxme.io freenode IRC, channel #tox. +##You can contact the maintainer of the toxme.io directly. + +I can be found on freenode IRC, channel #tox , or you can add me from tox by adding toxmeio@toxme.io . I can assist you with removing or changing your user account on toxme.io in the event that you forget your toxme.io-generated password. However, please note that you need to be able to prove the account in question is yours. This means that you need to have access to your old toxid. +I am not a tech support for tox issues. If you have an issue with tox, raise a ticket on github or ask someone on the IRC. + #ToxMe source ToxMe is a speedy and feature-packed Tox name resolution server. From 7b59667f0244d3b546d2db2f839383d6a5584a6d Mon Sep 17 00:00:00 2001 From: ben-Nabiy Derush Date: Tue, 27 Dec 2016 12:34:53 -0500 Subject: [PATCH 17/33] Update README.md pip3 update in multiple locations --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c8d44f6..dfb498c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,8 @@ make -j4 && make install cd .. && rm -rf libsodium* cd ~ git clone https://github.com/LittleVulpix/toxme -pip install -r misc/requirements.txt +cd toxme +pip3 install -r misc/requirements.txt ``` ### Optional: @@ -52,7 +53,7 @@ pip install -r misc/requirements.txt #####Ubuntu ```apt-get install libpq-dev``` -#####All +#####All ( For Ubuntu, use pip3 instead of pip ) ```pip install psycopg2``` From f9aaa912c8fc8ecaeca52b3b0da7127f6fbd6d09 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Wed, 28 Dec 2016 01:53:13 +0100 Subject: [PATCH 18/33] Update README.md libsodium is no longer available for direct download so we compile it manually. --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index dfb498c..113f2d9 100644 --- a/README.md +++ b/README.md @@ -28,17 +28,17 @@ pip install -r misc/requirements.txt And you should be ready! ###Ubuntu -Note: we use Ubuntu 14.04 +Note: we use Ubuntu 14.04, but newer releases should work too. ```bash -apt-get install python3 python3-pip libffi-dev build-essential wget git sqlite -wget -P /tmp/ https://download.libsodium.org/libsodium/releases/libsodium-1.0.3.tar.gz -cd /tmp/ -tar -xvf libsodium-1.0.3.tar.gz -cd libsodium* +apt-get install python3 python3-pip libffi-dev build-essential wget git sqlite libtool autotools-dev automake checkinstall check git yasm +git clone https://github.com/jedisct1/libsodium.git +cd libsodium +git checkout tags/1.0.3 +./autogen.sh ./configure --prefix=/usr -make -j4 && make install -cd .. && rm -rf libsodium* +make check +sudo make install cd ~ git clone https://github.com/LittleVulpix/toxme cd toxme From 6ed4909cbf38fd2034ef80c62282646457a17106 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Wed, 4 Jan 2017 19:57:55 +0100 Subject: [PATCH 19/33] @toxme.io is not an e-mail domain Make it more apparent because people were apparently confused by it. --- templates/tox/lookup_home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index d658d7a..23893e6 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -26,7 +26,7 @@

Don't know anyone? Find some friends here.

-

Contact the maintainer - toxmeio@toxme.io

+

Contact the maintainer - tox://toxmeio@toxme.io

From 49d529069a867129e42f6ac852e9b9e200bf1b56 Mon Sep 17 00:00:00 2001 From: Damon Harris Date: Sat, 1 Apr 2017 10:17:00 +0530 Subject: [PATCH 20/33] Fix headings in README --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 113f2d9..7d0d6a3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -##You can contact the maintainer of the toxme.io directly. +## You can contact the maintainer of the toxme.io directly. I can be found on freenode IRC, channel #tox , or you can add me from tox by adding toxmeio@toxme.io . @@ -8,15 +8,15 @@ However, please note that you need to be able to prove the account in question i I am not a tech support for tox issues. If you have an issue with tox, raise a ticket on github or ask someone on the IRC. -#ToxMe source +# ToxMe source ToxMe is a speedy and feature-packed Tox name resolution server. -##Installing: +## Installing: Quick notes before we get started, ToxMe's source is not required to access and use it in a client. Additionally, it's being written in OS X and ran on Ubuntu, so please correct any odd quirks I might accidentally include. -###OS X +### OS X Install homebrew from http://brew.sh ```bash @@ -27,7 +27,7 @@ pip install -r misc/requirements.txt And you should be ready! -###Ubuntu +### Ubuntu Note: we use Ubuntu 14.04, but newer releases should work too. ```bash @@ -47,17 +47,17 @@ pip3 install -r misc/requirements.txt ### Optional: #### postgres support: -#####OS X +##### OS X ```brew install postgresql``` -#####Ubuntu +##### Ubuntu ```apt-get install libpq-dev``` -#####All ( For Ubuntu, use pip3 instead of pip ) +##### All ( For Ubuntu, use pip3 instead of pip ) ```pip install psycopg2``` -##Getting started: +## Getting started: For most testing and development work you'll need both a config.json and a sqlite3 database. @@ -67,11 +67,11 @@ A database can be generated locally by running ```sqlite3 -init misc/structure.s Now just run python3 src/main.py and it should start automatically! -##Tips: +## Tips: If you're testing it locally make sure secure_mode in config.json is marked off (0) otherwise you'll be required to reverse proxy it and use an SSL cert -##Documentation: +## Documentation: - [API reference](/doc/api.md) - [config options](/doc/config.md) - [PyToxMe](https://github.com/ToxMe/PyToxMe) From d80ad34a7c813392498921b7174d1c8eff23475c Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Tue, 4 Jul 2017 23:07:43 +0200 Subject: [PATCH 21/33] Show full tox ID even when user has no bio Previously, full tox id shows only when user had bio. Makes no sense to do it this way. --- templates/tox/onemomentplease.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/tox/onemomentplease.html b/templates/tox/onemomentplease.html index d0d8270..1423f09 100644 --- a/templates/tox/onemomentplease.html +++ b/templates/tox/onemomentplease.html @@ -19,18 +19,18 @@ Click here to add {{record.name}}.

You can also add {{ record.name }}@{{ realm }} in your client.

- {% if record.bio %}
+ {% if record.bio %}

{{ record.bio }}

{{ record.name }}@{{ realm }} + {% end %} {% if record.pin %}

Full Tox ID: {{ record.public_key }}{{ record.pin }}{{ record.checksum }}

{% end %}
- {% end %}
From 65c1fc10ea78861a5043b908e83ef706dc17914f Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Wed, 5 Jul 2017 22:58:03 +0200 Subject: [PATCH 22/33] Add echobot as a test contact Sick and tired of people adding me to "test toxme". I'm here for technical issues. --- templates/tox/lookup_home.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index 23893e6..f0bf385 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -26,7 +26,8 @@

Don't know anyone? Find some friends here.

-

Contact the maintainer - tox://toxmeio@toxme.io

+

Want to test toxme? Add echobot! - tox://echobot@toxme.io +

Technical issues only - tox://toxmeio@toxme.io

From f91a3f29a3970ba68b70d61c15541deb588ded2f Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Thu, 7 Sep 2017 18:53:08 +0200 Subject: [PATCH 23/33] Add favicon to the template No more blank favicon on the pain page of toxme. --- templates/tox/lookup_home.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index f0bf385..dc0d9ab 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -3,6 +3,7 @@ + Tox ID Service From 08ad3296b5b86eab049ffff5df793b29dd638eae Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Thu, 7 Sep 2017 18:54:55 +0200 Subject: [PATCH 24/33] Upload the favicon file looking glass+tox padlock. I think it fits. --- static/favicon.ico | Bin 0 -> 20794 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/favicon.ico diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..e8db42e7ca3ab376df2f2960ee1a81d2b2dfcc81 GIT binary patch literal 20794 zcmd^HYiu1y72f-beQkpi$BFZ(n#8e_-Z+ly8^5k!_YuoU9LXv{ZiDg%C=``I8dMcj zUb3nNR8*k?R;89Axg?hO1#Q*-0s%!-s6U`ZAo2rIp{k8gR48qEMNP7N-`+j$+?(0m zxp&tNH5+Yqd}hv^bG|wA&F<{lmKDRl>BAQO-)VJy$g(zDmURoxX`J80NqHSdY;tn) zQ^jKOd7OWGKc0m`;iXck^zhN6M?Y9c{8|;@@Ohl}S~&Ch{72IxEwL#V)Tq}4;9CbjTRbhWv=bZJ3SG6p4?Q!;se=ig5|!xzLb}&rKKgtI^D4XF+YJmNAjgo&(zdZXR%b;!;@uIHj>NrV_m%u z=f9%FKRZ6l8~qp4eQI%OZ34in0VON7`wO<$J%nV4{V^pgRX&#Cs+axHkVEl&pr z1G{V|xx{kyQH$*$4D*G;XV||V4y?~Aeh&=~XT%4&){0Fwo3+=kUvD?JwAhJ6;sM8p zv9Z80VLPuw^+7Gy<0GCYPO34RoB3L-m&tC<+X{a zsm5BcL5}@G9UHamVZ-6q&6_u0hl5AnJjXb7IlNlD%b1YccUFvx!m-tOO-xM8n&7}T z(vDblb#;+LoD(7I=8r1-TK?EEXD;cmA!fQm?5Vax%HD$hEkW3f=kvX2cd1sp2M-=p zV-CXRpNKiG^JO)8SHbfV#x<|=hcc|^hf)6*rTua~_{qk{$AfUF=9`{deb(z$P&l`XS{GwabkbMv*^wQo43&}*6%(ORg8%S8~Ug_R3Fr`Np7p{)iQKX2l+EP zK0a(>gFFkrjpt8l-MYTsp`r5gq6P;UryIe$`C@U1V-SQ5^6E`LY{;|3r0O2uQ`Xhp z&ALFlg3W64E^=p!*!IH)?JlT!rk079@T>_oZEbB1kDJ&fb~l7~i^WODwoe{&odOR3 zkbIG=V6$n{Cgb_Te4-xDAiL@~-2mQwl=l66#C`GY5{qEMD^Kz)bdBc^pQ)vfAiMNQ z#fCrY4jCVvk0E52@jO`Y@^N~4dNcZdRbo+n;9g1%_xLtBMf%}YjoEKb-3Z=w@q7o* zKOdi-oo(QFh>r!#G5G&SH5S32JZs9aY`0;o?5Q5V-SA7q1sc+ zYD}%It;_R5HwU(C*`nfc5xS3~ug`)PPJol<@`b_~aK(%|rl?=sv15mC-tc~heuytR z{~)`9`qQS|62!aN{{F=1*w{AsdlF;$Wn902>lb;tWk=TA+xx2Dn09t{ir>G6?(E#$ zT*Aah@M#*jz1-8&aqLx8s;|o^Y;K+d#LD4BT}rj15&ch;RWPa13F)0-L6$Cg#cueD6WO z!eWEIKFXZ&*~7ddc6jykInbAYeFpMwc6iux&(XGR;-<~*&fUA2E0N{)WU17G{@&P+ zbzYa7u54Ri%s%_ds%}W$-R0#Y-tGLg*6%uk#u>Q$Xae{B91ES@hQ`KO_MyfXCU4l6 z?g-*ta9s&{S|8#6)9f=U9~mFk;d?ljWUoep&7EOz5Z$o6%QZm9E%X~}&_iM;Dr|uD z3F5+gIh|eLbcSOQh24<6J4OF=K4NWsFe)DfSIna+;=(-9+D#ik=W4W1LP@cAYxAITZOhT-*a`%E)t_AGfJrg=dlyy&Xj(zHmAl?=I z?%rPhZnAd0CSJS`0|#Ho7mLR01+ZvGo;(R$oNs`9=8xT&PVej+83{jsTx`Pfu9|oF zcI}iOHpB<-Pp%@?C7ffbuFOZu+~2Kv0J!`OP0h{D z_u=GMKN~u`VPsMAu8H4>)oMtm$(bkcE!o#`eH?h5!?}p^S=_p!_G+Safvh}Ee2&jsmgv&1=vp{Lmt~2UWzl6>bXl%j zw^7kezGs(MI(Dyp*aB9^7Z~qV7Ocz+c)>R%%@%5SZ1csUe-Mlhi;R Date: Fri, 3 Nov 2017 22:33:38 +0100 Subject: [PATCH 25/33] Fix headings in doc/config.md --- doc/config.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/config.md b/doc/config.md index 9cf8764..f7aea8a 100644 --- a/doc/config.md +++ b/doc/config.md @@ -1,61 +1,61 @@ -#Config options refrence +# Config options refrence config.json is a json based set of options evaluated by main.py that set various properties and options in the sever. -###Database URL +### Database URL ```"database_url": "sqlite:///tox.db"``` A SQL alchemy style connector to the database to use. This can be sqlite, postgres, mssql, etc. -###Registration domain +### Registration domain ```"registration_domain": "localhost"``` The domain appended by ToxMe to the end of records (user@localhost for http://localhost/u/user). -###Server port +### Server port ```"server_port": 8080``` The port ToxMe listens on for http. -###Server address +### Server address ```"server_addr": "127.0.0.1"``` The IP ToxMe listens on. `127.0.0.1` prevents outside connections while `0.0.0.0` allows all. -###PID File +### PID File ```"pid_file": "pidfile.dl"``` Where ToxMe places it's own PID. Useful for daemons. -###Is proxied +### Is proxied ```"is_proxied": 1``` Tells ToxMe to resolve a connecting clients IP from a reverse proxies headers. -###suid +### suid ```"suid": "toxme"``` The user ToxMe runs as, please ensure it exists. -###Sandboxing +### Sandboxing ```"sandbox": 1``` Removes API limits for testing. -###Template +### Template ```"templates" : "tox"``` The template to use for the web interface. -###Find friends +### Find friends ```"findfriends_enabled" : 1``` Enables friend discovery features. -###Number of workers +### Number of workers ```"number_of_workers": 2``` -Number of processes to use. \ No newline at end of file +Number of processes to use. From e62ccd7e1d471600d57f483940c272dc367fef90 Mon Sep 17 00:00:00 2001 From: Gregory Mullen Date: Fri, 12 Jan 2018 13:34:52 -0800 Subject: [PATCH 26/33] Omit Bios from public view (#16) squashed changes to remove reference to bios from public view * Omit Bios from public view Hello darkness my ol' friend. * more fixes @LittleVulpix, squash this so I don't have to git clone --- templates/tox/public_userlist.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/templates/tox/public_userlist.html b/templates/tox/public_userlist.html index f8f9f50..4a9dfb3 100644 --- a/templates/tox/public_userlist.html +++ b/templates/tox/public_userlist.html @@ -24,13 +24,6 @@
{% for record in results_set %}
- {% if record.bio %} -

{{ record.bio }}

- {% else %} -

(There is only silence.)

- {% end %} -

- {{ record.name }}@{{ realm }} From c852428432d5cfafaaed70f646410c4e3a9379f5 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Fri, 12 Jan 2018 22:58:13 +0100 Subject: [PATCH 27/33] toxme.io copyright update for 2018 (#17) * add_ui year bump * addkeyweb_success year bump * api_error_pretty year bump * edit_ui year bump * fourohfour year bump * lookup_home year bump * onemomentplease year bump * public_userlist year bump --- templates/tox/add_ui.html | 2 +- templates/tox/addkeyweb_success.html | 2 +- templates/tox/api_error_pretty.html | 2 +- templates/tox/edit_ui.html | 2 +- templates/tox/fourohfour.html | 2 +- templates/tox/lookup_home.html | 2 +- templates/tox/onemomentplease.html | 2 +- templates/tox/public_userlist.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/tox/add_ui.html b/templates/tox/add_ui.html index 2119f4d..1c93c68 100644 --- a/templates/tox/add_ui.html +++ b/templates/tox/add_ui.html @@ -47,7 +47,7 @@
diff --git a/templates/tox/addkeyweb_success.html b/templates/tox/addkeyweb_success.html index 0190549..066b166 100644 --- a/templates/tox/addkeyweb_success.html +++ b/templates/tox/addkeyweb_success.html @@ -20,7 +20,7 @@
diff --git a/templates/tox/api_error_pretty.html b/templates/tox/api_error_pretty.html index 680c65b..87be5f6 100644 --- a/templates/tox/api_error_pretty.html +++ b/templates/tox/api_error_pretty.html @@ -20,7 +20,7 @@ diff --git a/templates/tox/edit_ui.html b/templates/tox/edit_ui.html index 09c0a7a..7a167f3 100644 --- a/templates/tox/edit_ui.html +++ b/templates/tox/edit_ui.html @@ -51,7 +51,7 @@
diff --git a/templates/tox/fourohfour.html b/templates/tox/fourohfour.html index 05956b5..4324594 100644 --- a/templates/tox/fourohfour.html +++ b/templates/tox/fourohfour.html @@ -24,7 +24,7 @@ diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index dc0d9ab..0943e79 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -45,7 +45,7 @@ diff --git a/templates/tox/onemomentplease.html b/templates/tox/onemomentplease.html index 1423f09..3ee56de 100644 --- a/templates/tox/onemomentplease.html +++ b/templates/tox/onemomentplease.html @@ -42,7 +42,7 @@ diff --git a/templates/tox/public_userlist.html b/templates/tox/public_userlist.html index 4a9dfb3..5e5d083 100644 --- a/templates/tox/public_userlist.html +++ b/templates/tox/public_userlist.html @@ -43,7 +43,7 @@ From fd5613c94d5392d3f0ac4a6a313c4e44f9699389 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Fri, 12 Jan 2018 23:25:05 +0100 Subject: [PATCH 28/33] Remove CDN dependency for the font+css (#18) Get rid of CDN dependency --- templates/tox/add_ui.html | 2 +- templates/tox/edit_ui.html | 2 +- templates/tox/lookup_home.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/tox/add_ui.html b/templates/tox/add_ui.html index 1c93c68..7c98828 100644 --- a/templates/tox/add_ui.html +++ b/templates/tox/add_ui.html @@ -5,7 +5,7 @@ Tox ID Service - + diff --git a/templates/tox/edit_ui.html b/templates/tox/edit_ui.html index 7a167f3..ccb8048 100644 --- a/templates/tox/edit_ui.html +++ b/templates/tox/edit_ui.html @@ -5,7 +5,7 @@ Tox ID Service - + diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index 0943e79..eb12ef8 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -6,7 +6,7 @@ Tox ID Service - + From ba2c5e38631bc1b9eb372085546d00c4933198c4 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Tue, 6 Mar 2018 22:08:36 +0100 Subject: [PATCH 29/33] This is why we can't have nice things. (#19) People constantly add me "no I just want to test toxme". The link to echobot for "TESTING TOXME" is literally right above mine! So there, no direct contact easily visibly on the site now. Enjoy your echobot. --- templates/tox/lookup_home.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index eb12ef8..1cee60a 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -28,7 +28,6 @@

Don't know anyone? Find some friends here.

Want to test toxme? Add echobot! - tox://echobot@toxme.io -

Technical issues only - tox://toxmeio@toxme.io

From 1895c8f6ac285901bb7bf1d1f3968067f59ff485 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Thu, 7 Mar 2019 23:58:47 +0100 Subject: [PATCH 30/33] No more friends (#22) * Remove "not in use" line. * Update logic to disable only friend listing When cfg value is set to 0, it now still allows adding/editing but no more public list of any user; you can still query normally however. --- src/main.py | 4 ++-- templates/tox/lookup_home.html | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index 9c3fbaa..8e4152a 100755 --- a/src/main.py +++ b/src/main.py @@ -866,12 +866,12 @@ def main(): (r"/barcode/(.+)\.svg$", CreateQR), (r"/u/(.+)?$", LookupAndOpenUser), (r"^/$", LookupAndOpenUser), + (r"/add_ui", AddKeyWeb), + (r"/edit_ui", EditKeyWeb), (r'/robots.txt', tornado.web.StaticFileHandler, {'path': robots_path}) ] if cfg["findfriends_enabled"]: handlers.append((r"/friends/([0-9]+)$", FindFriends)) - handlers.append((r"/add_ui", AddKeyWeb)) - handlers.append((r"/edit_ui", EditKeyWeb)) app = tornado.web.Application( handlers, template_path=os.path.join(os.path.dirname(__file__), templates_dir), diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index 1cee60a..e4901f8 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -26,7 +26,6 @@
-

Don't know anyone? Find some friends here.

Want to test toxme? Add echobot! - tox://echobot@toxme.io

From 045b7cd1e163794c2d8f9d0a24ff6ab735fdc442 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Thu, 30 May 2019 14:25:58 +0200 Subject: [PATCH 31/33] Don't redirect to friends, friends are no more. Could be done with the CFG but really, I don't wanna redirect to that page at all. --- src/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 8e4152a..c394bc2 100755 --- a/src/main.py +++ b/src/main.py @@ -719,7 +719,7 @@ def post(self): return elif action == "Delete": self.settings["local_store"].delete_pk(rec.public_key) - self.redirect("/friends/0") + self.redirect("/") return bio = self.get_body_argument("bio", "") or rec.bio @@ -747,7 +747,7 @@ def post(self): return if self.update_db_entry(rec.public_key, name, pkey, bio, check, privacy, pin): - self.redirect("/friends/0") + self.redirect("/") return class AddKeyWeb(APIHandler): From 1d8aed949f00868095c3fa34778a0486a7c1ee91 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Thu, 6 Jun 2019 15:57:04 +0200 Subject: [PATCH 32/33] It is 2019 my dudes. (#24) All the files updated with new copyright year. --- templates/tox/add_ui.html | 2 +- templates/tox/addkeyweb_success.html | 2 +- templates/tox/api_error_pretty.html | 2 +- templates/tox/edit_ui.html | 2 +- templates/tox/fourohfour.html | 2 +- templates/tox/lookup_home.html | 2 +- templates/tox/onemomentplease.html | 2 +- templates/tox/public_userlist.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/tox/add_ui.html b/templates/tox/add_ui.html index 7c98828..9bccaed 100644 --- a/templates/tox/add_ui.html +++ b/templates/tox/add_ui.html @@ -47,7 +47,7 @@
diff --git a/templates/tox/addkeyweb_success.html b/templates/tox/addkeyweb_success.html index 066b166..d42689d 100644 --- a/templates/tox/addkeyweb_success.html +++ b/templates/tox/addkeyweb_success.html @@ -20,7 +20,7 @@ diff --git a/templates/tox/api_error_pretty.html b/templates/tox/api_error_pretty.html index 87be5f6..e429748 100644 --- a/templates/tox/api_error_pretty.html +++ b/templates/tox/api_error_pretty.html @@ -20,7 +20,7 @@ diff --git a/templates/tox/edit_ui.html b/templates/tox/edit_ui.html index ccb8048..970cf6e 100644 --- a/templates/tox/edit_ui.html +++ b/templates/tox/edit_ui.html @@ -51,7 +51,7 @@ diff --git a/templates/tox/fourohfour.html b/templates/tox/fourohfour.html index 4324594..3c7b720 100644 --- a/templates/tox/fourohfour.html +++ b/templates/tox/fourohfour.html @@ -24,7 +24,7 @@ diff --git a/templates/tox/lookup_home.html b/templates/tox/lookup_home.html index e4901f8..90de3c7 100644 --- a/templates/tox/lookup_home.html +++ b/templates/tox/lookup_home.html @@ -43,7 +43,7 @@ diff --git a/templates/tox/onemomentplease.html b/templates/tox/onemomentplease.html index 3ee56de..208a871 100644 --- a/templates/tox/onemomentplease.html +++ b/templates/tox/onemomentplease.html @@ -42,7 +42,7 @@ diff --git a/templates/tox/public_userlist.html b/templates/tox/public_userlist.html index 5e5d083..cc63f7f 100644 --- a/templates/tox/public_userlist.html +++ b/templates/tox/public_userlist.html @@ -43,7 +43,7 @@ From 52c731993ad9bfb6eacde8ace91f896d718a2811 Mon Sep 17 00:00:00 2001 From: LittleVulpix Date: Tue, 8 Oct 2019 11:39:25 +0900 Subject: [PATCH 33/33] RIP https://blog.fefe.de/?ts=a3695410 and this is why we can't have nice things. --- README.md | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7d0d6a3..f8c9a28 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,23 @@ -## You can contact the maintainer of the toxme.io directly. +## I no longer run this service. -I can be found on freenode IRC, channel #tox , or you can add me from tox by adding toxmeio@toxme.io . +https://blog.fefe.de/?ts=a3695410 and this is why we can't have nice things. -I can assist you with removing or changing your user account on toxme.io in the event that you forget your toxme.io-generated password. +Due to recent uninformed and stupid decisions by people who should uphold and protect the law and order, and because I have no need of such drama in my life, I'm no longer maintaining this service. -However, please note that you need to be able to prove the account in question is yours. This means that you need to have access to your old toxid. +You can find me on toktok IRC if you are interested in having the torch passed to you, but I'll only accept trustworthy individuals I've known to be active in the community/dev team. -I am not a tech support for tox issues. If you have an issue with tox, raise a ticket on github or ask someone on the IRC. +So long. + + +~~## You can contact the maintainer of the toxme.io directly.~~ + +~~I can be found on freenode IRC, channel #tox , or you can add me from tox by adding toxmeio@toxme.io .~~ + +~~I can assist you with removing or changing your user account on toxme.io in the event that you forget your toxme.io-generated password.~~ + +~~However, please note that you need to be able to prove the account in question is yours. This means that you need to have access to your old toxid.~~ + +~~I am not a tech support for tox issues. If you have an issue with tox, raise a ticket on github or ask someone on the IRC.~~ # ToxMe source @@ -75,3 +86,5 @@ If you're testing it locally make sure secure_mode in config.json is marked off - [API reference](/doc/api.md) - [config options](/doc/config.md) - [PyToxMe](https://github.com/ToxMe/PyToxMe) + +~~