From 64f1fff27540721908994406068d3f53c5e63ef9 Mon Sep 17 00:00:00 2001 From: b3yond Date: Sun, 25 Mar 2018 17:31:51 +0200 Subject: [PATCH 1/8] don't even dare to try it out. I already changed it. :P --- config.toml.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.toml.example b/config.toml.example index ede3336..417b5f0 100644 --- a/config.toml.example +++ b/config.toml.example @@ -10,8 +10,8 @@ contact = "b3yond@riseup.net" [mail] mailserver = "smtp.riseup.net" -user = "nbgticketfrei" -passphrase = "5MUIGw,GmSj)t@xW!jixq=b0U+@SJ{K{" +user = "user" +passphrase = "sup3rs3cur3" [logging] # The directory where logs should be stored. From 9ac7ab3b70fd793d81e21b047233d63c37ed2f48 Mon Sep 17 00:00:00 2001 From: b3yond Date: Sun, 25 Mar 2018 17:50:28 +0200 Subject: [PATCH 2/8] config format changed --- frontend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend.py b/frontend.py index 685e83a..6da6f30 100755 --- a/frontend.py +++ b/frontend.py @@ -115,8 +115,8 @@ def twitter_callback(user): """ # twitter passes the verifier/oauth token secret in a GET request. verifier = request.query('oauth_verifier') - consumer_key = config["tapp"]["consumer_key"] - consumer_secret = config["tapp"]["consumer_secret"] + consumer_key = config["twitter"]["consumer_key"] + consumer_secret = config["twitter"]["consumer_secret"] auth = tweepy.OAuthHandler(consumer_key, consumer_secret) request_token = user.get_request_token auth.request_token = {"oauth_token": request_token, From 95ada7ba62656a6cfc2f7d33258b117d56b6482e Mon Sep 17 00:00:00 2001 From: b3yond Date: Sun, 25 Mar 2018 18:23:42 +0200 Subject: [PATCH 3/8] Lorem Ipsum -> actual promotion text --- promotion/{campaign.md => README.md} | 0 template/propaganda.tpl | 52 ++++++++++++++++------------ 2 files changed, 30 insertions(+), 22 deletions(-) rename promotion/{campaign.md => README.md} (100%) diff --git a/promotion/campaign.md b/promotion/README.md similarity index 100% rename from promotion/campaign.md rename to promotion/README.md diff --git a/template/propaganda.tpl b/template/propaganda.tpl index 479fcf6..000b106 100644 --- a/template/propaganda.tpl +++ b/template/propaganda.tpl @@ -1,29 +1,37 @@ % rebase('template/wrapper.tpl') % include('template/login-plain.tpl')

Features

-

sum is simply dummy text of the printing and typesetting - industry. Lorem Ipsum has been the industry's standard - dummy text ever since the 1500s, when an unknown printer - took a galley of type and scrambled it to make a type - specimen book. It has survived not only five centuries, - but also the leap into electronic typesetting, remaining - essentially unchanged. It was popularised in the 1960s - with the release of Letraset sheets containing Lorem - Ipsum passages, and more recently with desktop publishing - software like Aldus PageMaker including versions of Lorem - Ipsum.

+

+ Don't pay for public transport. Instead, warn each other + from ticket controllers! With Ticketfrei, you can turn + your city into a paradise for fare dodgers. +

+

+ Ticketfrei is a Twitter, Mastodon, and E-Mail bot. Users + can help each other by tweeting, tooting, or mailing, + when and where they spot a ticket controller. +

+

+ Ticketfrei automatically retweets, boosts, and remails + those controller reports, so others can see them. If there + are ticket controllers around, they can still buy a ticket + - but if the coast is clear, they can save the money. +

How to get Ticketfrei to my city?

-

sum is simply dummy text of the printing and typesetting - industry. Lorem Ipsum has been the industry's standard - dummy text ever since the 1500s, when an unknown printer - took a galley of type and scrambled it to make a type - specimen book. It has survived not only five centuries, - but also the leap into electronic typesetting, remaining - essentially unchanged. It was popularised in the 1960s - with the release of Letraset sheets containing Lorem - Ipsum passages, and more recently with desktop publishing - software like Aldus PageMaker including versions of Lorem - Ipsum.

+

+ We try to make it as easy as possible to spread Ticketfrei + to other citys. There are four basic steps: +

+
    +
  • Create a Twitter and/or a Mastodon account.
    • +
  • Register on this website to create a bot for your city.
    • +
  • Log in with the social media accounts you want to + use for Ticketfrei.
    • +
  • Promote the service! Ticketfrei only works if there is + a community for it. Fortunately, we prepared some material + you can use: + https://github.com/b3yond/ticketfrei/tree/master/promotion
    • +
% include('template/register-plain.tpl')

Our Mission

Contrary to popular belief, Lorem Ipsum is not simply random From c980e7abb5e31e0c705673818a29f9dc0ebf7b67 Mon Sep 17 00:00:00 2001 From: d24phant <37417381+d24phant@users.noreply.github.com> Date: Sun, 25 Mar 2018 22:06:31 +0200 Subject: [PATCH 4/8] Added "our_mission"-draft --- template/propaganda.tpl | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/template/propaganda.tpl b/template/propaganda.tpl index 000b106..61026d5 100644 --- a/template/propaganda.tpl +++ b/template/propaganda.tpl @@ -34,17 +34,18 @@ % include('template/register-plain.tpl')

Our Mission

-

Contrary to popular belief, Lorem Ipsum is not simply random - text. It has roots in a piece of classical Latin literature - from 45 BC, making it over 2000 years old. Richard - McClintock, a Latin professor at Hampden-Sydney College in - Virginia, looked up one of the more obscure Latin words, - consectetur, from a Lorem Ipsum passage, and going through - the cites of the word in classical literature, discovered - the undoubtable source. Lorem Ipsum comes from sections - 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" - (The Extremes of Good and Evil) by Cicero, written in 45 - BC. This book is a treatise on the theory of ethics, very - popular during the Renaissance. The first line of Lorem - Ipsum, "Lorem ipsum dolor sit amet..", comes from a line - in section 1.10.32.

+

+ Public transportation's meant to provide be an easy & + time-saving way to move within a region while being + affordable for everybody. Unfortunately, that ain't the + case. Ticketfrei's approach is to enable people to + reclaim public transportation. On short term by helping + users to avoid controles & fines - on long term by + pressuring public transportation companies to grant + their services free of charge, because wia using + Ticketfrei your able to use trains & subways for free, + anyways. Take part & create a new understanding of + what public transportation should look like! + + + From f99b44d8153e455e59ccfe0b7dd12cd402ddd186 Mon Sep 17 00:00:00 2001 From: d24phant <37417381+d24phant@users.noreply.github.com> Date: Sun, 25 Mar 2018 22:30:17 +0200 Subject: [PATCH 5/8] Fixed some fails :) --- template/propaganda.tpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/template/propaganda.tpl b/template/propaganda.tpl index 61026d5..e848303 100644 --- a/template/propaganda.tpl +++ b/template/propaganda.tpl @@ -35,17 +35,18 @@ % include('template/register-plain.tpl')

Our Mission

- Public transportation's meant to provide be an easy & + Public transportation's meant to provide an easy \& time-saving way to move within a region while being affordable for everybody. Unfortunately, that ain't the case. Ticketfrei's approach is to enable people to reclaim public transportation. On short term by helping - users to avoid controles & fines - on long term by + users to avoid controles \& fines - on long term by pressuring public transportation companies to grant - their services free of charge, because wia using - Ticketfrei your able to use trains & subways for free, - anyways. Take part & create a new understanding of + their services free of charge, because via using + Ticketfrei your able to use trains \& subways for free, + anyways. Take part \& create a new understanding of what public transportation should look like! +

From 2fdc6f1f28608d0a21a4e3f1cbc6bf1bec1adfd6 Mon Sep 17 00:00:00 2001 From: d24phant <37417381+d24phant@users.noreply.github.com> Date: Sun, 25 Mar 2018 22:31:00 +0200 Subject: [PATCH 6/8] Delete propaganda.tpl --- template/propaganda.tpl | 52 ----------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 template/propaganda.tpl diff --git a/template/propaganda.tpl b/template/propaganda.tpl deleted file mode 100644 index e848303..0000000 --- a/template/propaganda.tpl +++ /dev/null @@ -1,52 +0,0 @@ -% rebase('template/wrapper.tpl') -% include('template/login-plain.tpl') -

Features

-

- Don't pay for public transport. Instead, warn each other - from ticket controllers! With Ticketfrei, you can turn - your city into a paradise for fare dodgers. -

-

- Ticketfrei is a Twitter, Mastodon, and E-Mail bot. Users - can help each other by tweeting, tooting, or mailing, - when and where they spot a ticket controller. -

-

- Ticketfrei automatically retweets, boosts, and remails - those controller reports, so others can see them. If there - are ticket controllers around, they can still buy a ticket - - but if the coast is clear, they can save the money. -

-

How to get Ticketfrei to my city?

-

- We try to make it as easy as possible to spread Ticketfrei - to other citys. There are four basic steps: -

-
    -
  • Create a Twitter and/or a Mastodon account.
    • -
  • Register on this website to create a bot for your city.
    • -
  • Log in with the social media accounts you want to - use for Ticketfrei.
    • -
  • Promote the service! Ticketfrei only works if there is - a community for it. Fortunately, we prepared some material - you can use: - https://github.com/b3yond/ticketfrei/tree/master/promotion
    • -
-% include('template/register-plain.tpl') -

Our Mission

-

- Public transportation's meant to provide an easy \& - time-saving way to move within a region while being - affordable for everybody. Unfortunately, that ain't the - case. Ticketfrei's approach is to enable people to - reclaim public transportation. On short term by helping - users to avoid controles \& fines - on long term by - pressuring public transportation companies to grant - their services free of charge, because via using - Ticketfrei your able to use trains \& subways for free, - anyways. Take part \& create a new understanding of - what public transportation should look like! -

- - - From ce79b37b38c07f39a63363805779030ced42f46a Mon Sep 17 00:00:00 2001 From: d24phant <37417381+d24phant@users.noreply.github.com> Date: Sun, 25 Mar 2018 22:32:15 +0200 Subject: [PATCH 7/8] fixed some fails_pt2 Hopefully.... :) --- template/propaganda.tpl | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 template/propaganda.tpl diff --git a/template/propaganda.tpl b/template/propaganda.tpl new file mode 100644 index 0000000..75ddbba --- /dev/null +++ b/template/propaganda.tpl @@ -0,0 +1,52 @@ +% rebase('template/wrapper.tpl') +% include('template/login-plain.tpl') +

Features

+

+ Don't pay for public transport. Instead, warn each other + from ticket controllers! With Ticketfrei, you can turn + your city into a paradise for fare dodgers. +

+

+ Ticketfrei is a Twitter, Mastodon, and E-Mail bot. Users + can help each other by tweeting, tooting, or mailing, + when and where they spot a ticket controller. +

+

+ Ticketfrei automatically retweets, boosts, and remails + those controller reports, so others can see them. If there + are ticket controllers around, they can still buy a ticket + - but if the coast is clear, they can save the money. +

+

How to get Ticketfrei to my city?

+

+ We try to make it as easy as possible to spread Ticketfrei + to other citys. There are four basic steps: +

+
    +
  • Create a Twitter and/or a Mastodon account.
    • +
  • Register on this website to create a bot for your city.
    • +
  • Log in with the social media accounts you want to + use for Ticketfrei.
    • +
  • Promote the service! Ticketfrei only works if there is + a community for it. Fortunately, we prepared some material + you can use: + https://github.com/b3yond/ticketfrei/tree/master/promotion
    • +
+% include('template/register-plain.tpl') +

Our Mission

+

+ Public transportation's meant to provide an easy and + time-saving way to move within a region while being + affordable for everybody. Unfortunately, that ain't the + case. Ticketfrei's approach is to enable people to + reclaim public transportation. On short term by helping + users to avoid controles and fines - on long term by + pressuring public transportation companies to grant + their services free of charge, because via using + Ticketfrei your able to use trains and subways for + free, anyways. Take part and create a new understanding + of what public transportation should look like! +

+ + + From 5d2ffbd9359290d692a09a5b7ce08b7f5b46c8e3 Mon Sep 17 00:00:00 2001 From: b3yond Date: Sun, 25 Mar 2018 22:49:14 +0200 Subject: [PATCH 8/8] more paragraphs, some typos --- template/propaganda.tpl | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/template/propaganda.tpl b/template/propaganda.tpl index 75ddbba..4a3b034 100644 --- a/template/propaganda.tpl +++ b/template/propaganda.tpl @@ -35,18 +35,24 @@ % include('template/register-plain.tpl')

Our Mission

- Public transportation's meant to provide an easy and + Public transportation is meant to provide an easy and time-saving way to move within a region while being - affordable for everybody. Unfortunately, that ain't the + affordable for everybody. Unfortunately, this is not the case. Ticketfrei's approach is to enable people to - reclaim public transportation. On short term by helping - users to avoid controles and fines - on long term by - pressuring public transportation companies to grant - their services free of charge, because via using - Ticketfrei your able to use trains and subways for - free, anyways. Take part and create a new understanding - of what public transportation should look like! + reclaim public transportation. +

+ On short term we want to do this by helping users to avoid + controllers and fines - on long term by pressuring public + transportation companies to offer their services free of + charge, financed by the public. +

+

+ Because with Ticketfrei you're able to use trains and + subways for free anyway. Take part and create a new + understanding of what public transportation should look + like! +