From 530f0787446626f5c131f70c31d4d3c4173f58ad Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Tue, 23 Jun 2020 14:05:14 -0400 Subject: [PATCH] tilde.club fork --- MANIFEST.in | 6 + README.html | 272 ++++++++++++-------------------- README.md | 42 ++--- doc/manual.html | 32 ++-- doc/manual.md | 34 ++-- setup.py | 8 +- ttbp/chatter.py | 2 - ttbp/config/__init__.py | 11 +- ttbp/config/defaults/header.txt | 2 +- ttbp/config/defaults/style.css | 2 +- ttbp/core.py | 12 +- ttbp/gopher.py | 2 +- ttbp/ttbp.py | 29 ++-- 13 files changed, 191 insertions(+), 263 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..6e30a78 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +include ttbp/config/defaults/*.txt +include ttbp/config/defaults/style.css +include ttbp/README.html +include README.md +include doc/manual.html +include doc/manual.md diff --git a/README.html b/README.html index 19a9e47..422ff9e 100644 --- a/README.html +++ b/README.html @@ -1,287 +1,215 @@ -

a command-line based blogging platform running on tilde.town

- -

ttbp stands for “tilde.town blogging platform”, the original working name for +

a command-line based blogging platform

+

ttbp stands for "tilde.town blogging platform", the original working name for this project.

- -

ttbp main menu screenshot

- -

ttbp entries view screenshot

- -

ttbp compose view screenshot

- +

ttbp main menu screenshot

+

ttbp entries view screenshot

+

ttbp compose view screenshot

ttbp runs from the command line, providing a hub for writing personal blog -posts and reading posts written by other users of tilde.town. it’s a little bit +posts and reading posts written by other users of tilde.club. it's a little bit like livejournal or dreamwidth or tumblr. you can opt to publish your posts to a -public html file hosted on your tilde page, to tilde.town’s gopher server, or -keep all your entries private to the tilde.town server.

- -

to use, run feels while logged in to tilde.town

- -

this is a project that runs on tilde.town, so all users of this program are -expected to operate under the tilde.town code of +public html file hosted on your tilde page, to tilde.club's gopher server, or +keep all your entries private to the tilde.club server.

+

to use, run feels while logged in to tilde.club

+

this is a project that runs on tilde.club, so all users of this program are +expected to operate under the tilde.club code of conduct. content/personal issues should be -worked out according to the CoC, with support from the administrative +worked out according to the CoC, with support from the administrative team if needed.

-

QUICK START

-

no coding or html experience is necessary to get started. just log in to your -tilde.town account and enter:

- +tilde.club account and enter:

feels

-

ttbp will ask you a few questions to get you started. after that, writing and reading entries all happen within the program.

- -

that’s it!

- +

that's it!

support

- -

if you’re having trouble getting started, or run into program errors or strange -behavior, please send internal tilde.town mail to ~endorphant and i’ll try to +

if you're having trouble getting started, or run into program errors or strange +behavior, please send internal tilde.club mail to ~endorphant and i'll try to sort things out!

- -

there’s also a function from the main menu that lets you send feedback/inquiries -to me directly; this uses internal tilde.town mail, which is what i’ll respond +

there's also a function from the main menu that lets you send feedback/inquiries +to me directly; this uses internal tilde.club mail, which is what i'll respond to.

-

writing entries

-

entries are recorded as plaintext files in your ~/.ttbp/entries directory. ttbp will use your selected editor to open and write files; each day is its -own entry, like a diary page. at midnight for whatever timezone you’ve set for -your user account on tilde.town, you’ll get a fresh entry. if you don’t write +own entry, like a diary page. at midnight for whatever timezone you've set for +your user account on tilde.club, you'll get a fresh entry. if you don't write any feels on a particular day, no entries will show up there.

-

when you save and quit the text editor, your entry will automatically propagate -to the global feels list; if you’ve opted to publish your feels to html/gopher, -those files will update immediately. you can always go back to the current day’s -entry and edit/add as you’d like, but older entries will not be available for +to the global feels list; if you've opted to publish your feels to html/gopher, +those files will update immediately. you can always go back to the current day's +entry and edit/add as you'd like, but older entries will not be available for editing from ttbp.

- -

(since files are just stored as plaintext in your directory, it’s possible to +

(since files are just stored as plaintext in your directory, it's possible to edit and move old entries directly from the command line. however, changing old entries might cause strange things to happen with timestamps. the main program looks at the filename first for setting the date, then the last modified time to -sort recent posts. it expects YYYMMDD.txt as the filename; anything else won’t +sort recent posts. it expects YYYMMDD.txt as the filename; anything else won't show up as a valid entry. yes, this means you can post things out of date order by creating files with any date you want.)

-

general entry-writing notes

- - -

reading other feels

-

the browse global feels feature shows the ten most recent entries that anyone -has written on ttbp. this list is only accessible from within tilde.town, +has written on ttbp. this list is only accessible from within tilde.club, although individual entries may be posted to html or gopher.

- -

you can also pull up a list of a single user’s feels through check out your +

you can also pull up a list of a single user's feels through check out your neighbors, which displays all users who are writing on ttbp based on their -most recently updated entry, and a link to their public html blog if they’ve +most recently updated entry, and a link to their public html blog if they've opted to publish their posts.

-

please note! entries written on ttbp should be considered sensitive, private information, even if a particular user is publishing entries in a -world-viewable way! please be respectful about having access to other people’s +world-viewable way! please be respectful about having access to other people's feels, and do not copy/repeat any information without getting their explicit -permission. tilde.town operates on a high level of mutual trust, and ttbp is +permission. tilde.club operates on a high level of mutual trust, and ttbp is designed to give individuals control over their content.

-

subscribing to users

-

the visit your subscriptions feature lets you view recent entries from a list -of users you’ve subscribed to, as well as manage your subscription list. your +of users you've subscribed to, as well as manage your subscription list. your list is saved to ~/.ttbp/config/subs, which gets automatically updated when you add or remove subscriptions from ttbp.

-

your subscription list is private; this means no one other than you can see who -you’re following. subscription view only shows the 50 most recent entries from +you're following. subscription view only shows the 50 most recent entries from your subscribe list; if you want to see more entries from an individual, you can navigate to their entries in `check out your neighbors from the main menu.

-

privacy

-

when you start your ttbp, you have the option of publishing or not publishing your blog.

-

if you opt to not publish, your entires will never be accessible from outside of -the tilde.town network; other tilde.town users will still be able to read your +the tilde.club network; other tilde.club users will still be able to read your entries through the ttbp interface, or by directly accessing your ~/.ttbp/entries directory.

-

if you want to further protect your entries, you can chmod 700 your entries directory.

-

if you opt to publish, the program creates a directory ~/.ttbp/www where it stores all html files it generates, and symlinks this from your ~/public_html -with your chosen blog directory. your blog will also be listed on the main ttbp +with your chosen blog directory. your blog will also be listed on the main ttbp page.

-

you can also opt to publish to gopher, and the program will automatically generate a gophermap of your feels.

-

you can set publishing status on individual entries, or bury individual feels; -see “data management” below for details.

- +see "data management" below for details.

data management

-

the manage your feels menu provides several tools for organizing your feels. these are all actions you can perform manually from the command line, but doing them from within the program can help keep your files properly linked up.

-
    -
  • read over feels–a list of all your entries, which you can open and -read like any other feel
    • -
  • modify feels publishing–this lets you toggle privacy on individual -posts. entries marked (nopub) will not get written to html or gopher, -and toggling them from this menu will immediately publish or unpublish -that entry (if you’re not publishing your posts at all, these settings -won’t matter, since your feels will never show up outside of tilde.town)
    • -
  • backup your feels–makes a .tar.gz of all your entries, saving one -copy to ~/.ttbp/backups/ with the current date, and a second copy to -your home directory for safekeeping.
    • -
  • import a feels backup–unpacks a backup file into your current feels -list. this tool checks the ~/.ttbp/backups directory for archives, and -expects a file created by the above backup utility. if it detects any file -collisions, it will preserve your current live copy and leave the backup -verison in a temp directory, and notify you that this happened. also, any -entries that were previously marked as (nopub) will retain their nopub -status.
    • -
  • bury some feels–hides individual feels from viewing; entries are -moved to ~/.ttbp/buried (and marked with a unique timestamp to prevent -file collision) with permissions set to 600, meaning no one except you -will be able to open that file. these entries are also hidden from your -own view from read over feels, and you’ll have to open the files from -the command line if you want to see them. this is intended to be a -permament action, so you’ll be asked to type the entry date once to load -the feel, then shown a preview of that feel, and then type the date again -to confirm burying.
    • -
  • delete feels by day–permanently removes individual entries, -including deleting published html/gopher files if needed. this action is -not recoverable, unless you have a backup to restore; you’ll be asked to -type the entry date once to load the feel, then shown a preview of that -feel, and then type the date again to confirm deletion.
    • -
  • purge all feels–permanently removes all feels, including deleting -all published html/gopher files if needed. this action is not recoverable, -unless you have a backup to restore. you’ll be asked to type a -one-time-use purge code to confirm this action.
    • -
  • wipe feels account–permanently removes all data associated with -feels, including deleting any published hmtl/gopher files and removing -your ~/.ttbp directory. any backups that you have in ~/.ttbp/backups -will also be deleted with this action (which is why the backup function -makes a second copy for safekeeping in your home directory). you will no -longer show up in any lists as a user.
    • +
  • read over feels--a list of all your entries, which you can open and + read like any other feel
    • +
  • modify feels publishing--this lets you toggle privacy on individual + posts. entries marked (nopub) will not get written to html or gopher, + and toggling them from this menu will immediately publish or unpublish + that entry (if you're not publishing your posts at all, these settings + won't matter, since your feels will never show up outside of tilde.club)
    • +
  • backup your feels--makes a .tar.gz of all your entries, saving one + copy to ~/.ttbp/backups/ with the current date, and a second copy to + your home directory for safekeeping.
    • +
  • import a feels backup--unpacks a backup file into your current feels + list. this tool checks the ~/.ttbp/backups directory for archives, and + expects a file created by the above backup utility. if it detects any file + collisions, it will preserve your current live copy and leave the backup + verison in a temp directory, and notify you that this happened. also, any + entries that were previously marked as (nopub) will retain their nopub + status.
    • +
  • bury some feels--hides individual feels from viewing; entries are + moved to ~/.ttbp/buried (and marked with a unique timestamp to prevent + file collision) with permissions set to 600, meaning no one except you + will be able to open that file. these entries are also hidden from your + own view from read over feels, and you'll have to open the files from + the command line if you want to see them. this is intended to be a + permament action, so you'll be asked to type the entry date once to load + the feel, then shown a preview of that feel, and then type the date again + to confirm burying.
    • +
  • delete feels by day--permanently removes individual entries, + including deleting published html/gopher files if needed. this action is + not recoverable, unless you have a backup to restore; you'll be asked to + type the entry date once to load the feel, then shown a preview of that + feel, and then type the date again to confirm deletion.
    • +
  • purge all feels--permanently removes all feels, including deleting + all published html/gopher files if needed. this action is not recoverable, + unless you have a backup to restore. you'll be asked to type a + one-time-use purge code to confirm this action.
    • +
  • wipe feels account--permanently removes all data associated with + feels, including deleting any published hmtl/gopher files and removing + your ~/.ttbp directory. any backups that you have in ~/.ttbp/backups + will also be deleted with this action (which is why the backup function + makes a second copy for safekeeping in your home directory). you will no + longer show up in any lists as a user.
- -

settings

-

the settings menu lets you change specific options for handling your feels and using the interface.

-
    -
  • editor–set your text editor
    • -
  • gopher–opt in or out of automatically posting to gopher
    • -
  • post as nopub–set whether posts default to being published or not -published (if you’re not publishing your feels, this doesn’t matter)
    • -
  • publish dir–set the directory under you public_html where feels will be -published (if you’re not publishing your feels, this defaults to None)
    • -
  • publishing–opt in or out of automatically publishing entries to a -world-readable html page
    • -
  • rainbows–opt in or out of having multicolored menu text
    • +
  • editor--set your text editor
    • +
  • gopher--opt in or out of automatically posting to gopher
    • +
  • post as nopub--set whether posts default to being published or not + published (if you're not publishing your feels, this doesn't matter)
    • +
  • publish dir--set the directory under you public_html where feels will be + published (if you're not publishing your feels, this defaults to None)
    • +
  • publishing--opt in or out of automatically publishing entries to a + world-readable html page
    • +
  • rainbows--opt in or out of having multicolored menu text
- -

changing your page layout

-

you can modify how your blog looks by editing the stylesheet or header and footer files. the program sets you up with basic default. if you break your page somehow, you can force the program to regenerate your configuration by deleting your ~/.ttbp directory entirely. you might want to back up your ~/.ttbp/entries directory before you do this.

-
  • to modify your stylesheet, edit your ~/.ttbp/config/style.css
    • -
  • to modify the page header, edit your ~/.ttbp/config/header.txt - -
      -
    • there’s a place marked off in the default header where you can safely put -custom HTML elements!
      • -
    -
    • +
  • to modify the page header, edit your ~/.ttbp/config/header.txt
    • +
  • there's a place marked off in the default header where you can safely put + custom HTML elements!
  • to modify the page footer, edit your ~/.ttbp/config/footer.txt
- -

general tips/troubleshooting

-
    -
  • if the date looks like it’s ahead or behind, it’s because you haven’t set -your local timezone yet. here are some -timezone setting instructions
    • +
  • if the date looks like it's ahead or behind, it's because you haven't set + your local timezone yet. here are some + timezone setting instructions
  • the feels burying tool will effectively clear your post for the day; you can -use this feature to start a fresh entry on a particular day by burying the -current day’s feels and then editing a new file
    • + use this feature to start a fresh entry on a particular day by burying the + current day's feels and then editing a new file
- -

future features

-

these are a few ideas being kicked around, or under active development:

-
  • stylesheet/theme selector
  • better entry display within ttbp (currently just offloads to less)
  • buried feels browser
- -

other ideas are listed on github as upcoming features or feature requests!

-

dependencies

-

(this section is only relevant if you plan on forking the repo and running an instance of this yourself)

- - -

contributing

-

please check out my contributor guidelines -on github if you’d like to get involved with development!

- +on github if you'd like to get involved with development!

if you find any bugs or strange behavior, please message me locally on tildemail -or open a github issue and i’ll get back to you as soon as i can.

- -

if you’re interested in helping with the code, please drop me some tildemail!

- +or open a github issue and i'll get back to you as soon as i can.

+

if you're interested in helping with the code, please drop me some tildemail!

i accept tips for development work on liberapay

-

contributor shout-outs

-

thanks to:

-
  • ~vilmibm, packaging help and gopher support
  • ~sanqui, the bug swatter
  • ~sinacutie, for css updates
    • -
- +
  • ~epicmorphism, for fixing pagination scrolling
    • + \ No newline at end of file diff --git a/README.md b/README.md index d17d2b0..538d30e 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,33 @@ -*a command-line based blogging platform running on tilde.town* +*a command-line based blogging platform* `ttbp` stands for "tilde.town blogging platform", the original working name for this project. -![ttbp main menu screenshot](http://tilde.town/~endorphant/ttbp/screenshots/ttbp-main.png) +![ttbp main menu screenshot](https://raw.githubusercontent.com/modgethanc/ttbp/master/screenshots/ttbp-main.png) -![ttbp entries view screenshot](http://tilde.town/~endorphant/ttbp/screenshots/ttbp-entries.png) +![ttbp entries view screenshot](https://raw.githubusercontent.com/modgethanc/ttbp/master/screenshots/ttbp-entries.png) -![ttbp compose view screenshot](http://tilde.town/~endorphant/ttbp/screenshots/ttbp-compose.png) +![ttbp compose view screenshot](https://raw.githubusercontent.com/modgethanc/ttbp/master/screenshots/ttbp-compose.png) `ttbp` runs from the command line, providing a hub for writing personal blog -posts and reading posts written by other users of tilde.town. it's a little bit +posts and reading posts written by other users of tilde.club. it's a little bit like livejournal or dreamwidth or tumblr. you can opt to publish your posts to a -public html file hosted on your tilde page, to tilde.town's gopher server, or -keep all your entries private to the tilde.town server. +public html file hosted on your tilde page, to tilde.club's gopher server, or +keep all your entries private to the tilde.club server. -to use, run `feels` while logged in to tilde.town +to use, run `feels` while logged in to tilde.club -this is a project that runs on tilde.town, so all users of this program are -expected to operate under the tilde.town [code of -conduct](http://tilde.town/wiki/conduct.html). content/personal issues should be +this is a project that runs on tilde.club, so all users of this program are +expected to operate under the tilde.club [code of +conduct](https://tilde.club/wiki/code-of-conduct.html). content/personal issues should be worked out according to the CoC, with support from the [administrative -team](http://tilde.town/wiki/administration/index.html) if needed. +team](https://tilde.club/wiki/code-of-conduct.html#contact-info) if needed. ### QUICK START no coding or html experience is necessary to get started. just log in to your -tilde.town account and enter: +tilde.club account and enter: `feels` @@ -39,11 +39,11 @@ that's it! ### support if you're having trouble getting started, or run into program errors or strange -behavior, please send internal tilde.town mail to ~endorphant and i'll try to +behavior, please send internal tilde.club mail to ~endorphant and i'll try to sort things out! there's also a function from the main menu that lets you send feedback/inquiries -to me directly; this uses internal tilde.town mail, which is what i'll respond +to me directly; this uses internal tilde.club mail, which is what i'll respond to. ### writing entries @@ -51,7 +51,7 @@ to. entries are recorded as plaintext files in your `~/.ttbp/entries` directory. `ttbp` will use your selected editor to open and write files; each day is its own entry, like a diary page. at midnight for whatever timezone you've set for -your user account on tilde.town, you'll get a fresh entry. if you don't write +your user account on tilde.club, you'll get a fresh entry. if you don't write any feels on a particular day, no entries will show up there. when you save and quit the text editor, your entry will automatically propagate @@ -79,7 +79,7 @@ by creating files with any date you want.)* ### reading other feels the `browse global feels` feature shows the ten most recent entries that anyone -has written on ttbp. this list is only accessible from within tilde.town, +has written on ttbp. this list is only accessible from within tilde.club, although individual entries may be posted to html or gopher. you can also pull up a list of a single user's feels through `check out your @@ -91,7 +91,7 @@ opted to publish their posts. private information, even if a particular user is publishing entries in a world-viewable way! please be respectful about having access to other people's feels, and do not copy/repeat any information without getting their explicit -permission. tilde.town operates on a high level of mutual trust, and `ttbp` is +permission. tilde.club operates on a high level of mutual trust, and `ttbp` is designed to give individuals control over their content. ### subscribing to users @@ -113,7 +113,7 @@ when you start your ttbp, you have the option of publishing or not publishing your blog. if you opt to not publish, your entires will never be accessible from outside of -the tilde.town network; other tilde.town users will still be able to read your +the tilde.club network; other tilde.club users will still be able to read your entries through the ttbp interface, or by directly accessing your `~/.ttbp/entries` directory. @@ -123,7 +123,7 @@ directory. if you opt to publish, the program creates a directory `~/.ttbp/www` where it stores all html files it generates, and symlinks this from your `~/public_html` with your chosen blog directory. your blog will also be listed on the [main ttbp -page](https://tilde.town/~endorphant/ttbp). +page](https://tilde.club/wiki/ttbp.html). you can also opt to publish to gopher, and the program will automatically generate a gophermap of your feels. @@ -143,7 +143,7 @@ them from within the program can help keep your files properly linked up. posts. entries marked `(nopub)` will not get written to html or gopher, and toggling them from this menu will immediately publish or unpublish that entry (if you're not publishing your posts at all, these settings - won't matter, since your feels will never show up outside of tilde.town) + won't matter, since your feels will never show up outside of tilde.club) * **backup your feels**--makes a .tar.gz of all your entries, saving one copy to `~/.ttbp/backups/` with the current date, and a second copy to your home directory for safekeeping. diff --git a/doc/manual.html b/doc/manual.html index 3fe7787..a0ce2e5 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -1,29 +1,27 @@

    FEELS MANUAL

    ttbp stands for "tilde.town blogging platform", the original working name for this project. the complete codebase is available on -github.

    +github.

    ttbp runs from the command line, providing a hub for writing personal blog -posts and reading posts written by other users of tilde.town. it's a little bit +posts and reading posts written by other users of tilde.club. it's a little bit like livejournal or dreamwidth or tumblr. you can opt to publish your posts to a -public html file hosted on your tilde page, to tilde.town's gopher server, or -keep all your entries private to the tilde.town server.

    -

    this is a project that runs on tilde.town, so all users of this program are -expected to operate under the tilde.town code of +public html file hosted on your tilde page, to tilde.club's gopher server, or +keep all your entries private to the tilde.club server.

    +

    this is a project that runs on tilde.club, so all users of this program are +expected to operate under the tilde.club code of conduct. content/personal issues should be -worked out according to the CoC, with support from the administrative +worked out according to the CoC, with support from the administrative team if needed.

    support

    if you're having trouble getting started, or run into program errors or strange -behavior, please send internal tilde.town mail to ~endorphant and i'll try to -sort things out!

    +behavior, please hop on irc and contact ben or deepend.

    there's also a function from the main menu that lets you send feedback/inquiries -to me directly; this uses internal tilde.town mail, which is what i'll respond -to.

    +to me directly; this uses email, which is what i'll respond to.

    writing entries

    entries are recorded as plaintext files in your ~/.ttbp/entries directory. ttbp will use your selected editor to open and write files; each day is its own entry, like a diary page. at midnight for whatever timezone you've set for -your user account on tilde.town, you'll get a fresh entry. if you don't write +your user account on tilde.club, you'll get a fresh entry. if you don't write any feels on a particular day, no entries will show up there.

    when you save and quit the text editor, your entry will automatically propagate to the global feels list; if you've opted to publish your feels to html/gopher, @@ -47,7 +45,7 @@ by creating files with any date you want.)

    reading other feels

    the browse global feels feature shows the ten most recent entries that anyone -has written on ttbp. this list is only accessible from within tilde.town, +has written on ttbp. this list is only accessible from within tilde.club, although individual entries may be posted to html or gopher.

    you can also pull up a list of a single user's feels through check out your neighbors, which displays all users who are writing on ttbp based on their @@ -57,20 +55,20 @@ opted to publish their posts.

    private information, even if a particular user is publishing entries in a world-viewable way! please be respectful about having access to other people's feels, and do not copy/repeat any information without getting their explicit -permission. tilde.town operates on a high level of mutual trust, and ttbp is +permission. tilde.club operates on a high level of mutual trust, and ttbp is designed to give individuals control over their content.

    privacy

    when you start your ttbp, you have the option of publishing or not publishing your blog.

    if you opt to not publish, your entires will never be accessible from outside of -the tilde.town network; other tilde.town users will still be able to read your +the tilde.club network; other tilde.club users will still be able to read your entries through the ttbp interface, or by directly accessing your ~/.ttbp/entries directory.

    if you want to further protect your entries, you can chmod 700 your entries directory.

    if you opt to publish, the program creates a directory ~/.ttbp/www where it stores all html files it generates, and symlinks this from your ~/public_html -with your chosen blog directory. your blog will also be listed on the main ttbp +with your chosen blog directory. your blog will also be listed on the main ttbp page.

    you can also opt to publish to gopher, and the program will automatically generate a gophermap of your feels.

    @@ -87,7 +85,7 @@ them from within the program can help keep your files properly linked up.

    posts. entries marked (nopub) will not get written to html or gopher, and toggling them from this menu will immediately publish or unpublish that entry (if you're not publishing your posts at all, these settings - won't matter, since your feels will never show up outside of tilde.town) + won't matter, since your feels will never show up outside of tilde.club)
  • backup your feels--makes a .tar.gz of all your entries, saving one copy to ~/.ttbp/backups/ with the current date, and a second copy to your home directory for safekeeping.
    • diff --git a/doc/manual.md b/doc/manual.md index a09ec22..0dabbe7 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -2,36 +2,34 @@ `ttbp` stands for "tilde.town blogging platform", the original working name for this project. the complete codebase is available on -[github](https://github.com/modgethanc/ttbp). +[github](https://github.com/tildeclub/ttbp). `ttbp` runs from the command line, providing a hub for writing personal blog -posts and reading posts written by other users of tilde.town. it's a little bit +posts and reading posts written by other users of tilde.club. it's a little bit like livejournal or dreamwidth or tumblr. you can opt to publish your posts to a -public html file hosted on your tilde page, to tilde.town's gopher server, or -keep all your entries private to the tilde.town server. +public html file hosted on your tilde page, to tilde.club's gopher server, or +keep all your entries private to the tilde.club server. -this is a project that runs on tilde.town, so all users of this program are -expected to operate under the tilde.town [code of -conduct](http://tilde.town/wiki/conduct.html). content/personal issues should be +this is a project that runs on tilde.club, so all users of this program are +expected to operate under the tilde.club [code of +conduct](http://tilde.club/wiki/code-of-conduct.html). content/personal issues should be worked out according to the CoC, with support from the [administrative -team](http://tilde.town/wiki/administration/index.html) if needed. +team](https://tilde.club/wiki/code-of-conduct.html#contact-info) if needed. ### support if you're having trouble getting started, or run into program errors or strange -behavior, please send internal tilde.town mail to ~endorphant and i'll try to -sort things out! +behavior, please hop on irc and contact ben or deepend. there's also a function from the main menu that lets you send feedback/inquiries -to me directly; this uses internal tilde.town mail, which is what i'll respond -to. +to me directly; this uses email, which is what i'll respond to. ### writing entries entries are recorded as plaintext files in your `~/.ttbp/entries` directory. `ttbp` will use your selected editor to open and write files; each day is its own entry, like a diary page. at midnight for whatever timezone you've set for -your user account on tilde.town, you'll get a fresh entry. if you don't write +your user account on tilde.club, you'll get a fresh entry. if you don't write any feels on a particular day, no entries will show up there. when you save and quit the text editor, your entry will automatically propagate @@ -59,7 +57,7 @@ by creating files with any date you want.)* ### reading other feels the `browse global feels` feature shows the ten most recent entries that anyone -has written on ttbp. this list is only accessible from within tilde.town, +has written on ttbp. this list is only accessible from within tilde.club, although individual entries may be posted to html or gopher. you can also pull up a list of a single user's feels through `check out your @@ -71,7 +69,7 @@ opted to publish their posts. private information, even if a particular user is publishing entries in a world-viewable way! please be respectful about having access to other people's feels, and do not copy/repeat any information without getting their explicit -permission. tilde.town operates on a high level of mutual trust, and `ttbp` is +permission. tilde.club operates on a high level of mutual trust, and `ttbp` is designed to give individuals control over their content. ### privacy @@ -80,7 +78,7 @@ when you start your ttbp, you have the option of publishing or not publishing your blog. if you opt to not publish, your entires will never be accessible from outside of -the tilde.town network; other tilde.town users will still be able to read your +the tilde.club network; other tilde.club users will still be able to read your entries through the ttbp interface, or by directly accessing your `~/.ttbp/entries` directory. @@ -90,7 +88,7 @@ directory. if you opt to publish, the program creates a directory `~/.ttbp/www` where it stores all html files it generates, and symlinks this from your `~/public_html` with your chosen blog directory. your blog will also be listed on the [main ttbp -page](https://tilde.town/~endorphant/ttbp). +page](https://tilde.club/wiki/ttbp.html). you can also opt to publish to gopher, and the program will automatically generate a gophermap of your feels. @@ -110,7 +108,7 @@ them from within the program can help keep your files properly linked up. posts. entries marked `(nopub)` will not get written to html or gopher, and toggling them from this menu will immediately publish or unpublish that entry (if you're not publishing your posts at all, these settings - won't matter, since your feels will never show up outside of tilde.town) + won't matter, since your feels will never show up outside of tilde.club) * **backup your feels**--makes a .tar.gz of all your entries, saving one copy to `~/.ttbp/backups/` with the current date, and a second copy to your home directory for safekeeping. diff --git a/setup.py b/setup.py index 5fb662a..ee2c1d3 100644 --- a/setup.py +++ b/setup.py @@ -15,11 +15,11 @@ setup( 'License :: OSI Approved :: MIT License', ], keywords='blog', - packages=['ttbp'], + packages=setuptools.find_packages(), install_requires = [ - 'inflect==0.2.5', - 'mistune==0.8.1', - 'colorama==0.3.9', + 'inflect', + 'mistune', + 'colorama', 'six' ], include_package_data = True, diff --git a/ttbp/chatter.py b/ttbp/chatter.py index ed2bbda..9886d30 100644 --- a/ttbp/chatter.py +++ b/ttbp/chatter.py @@ -16,7 +16,6 @@ DEFAULT_LANG = { ], "bye":[ "see you later, space cowboy", - "bye, townie", "until next time, friend", "come back whenever" ], @@ -24,7 +23,6 @@ DEFAULT_LANG = { "friend", "pal", "buddy", - "townie" ], "months":{ "01":"january", diff --git a/ttbp/config/__init__.py b/ttbp/config/__init__.py index 9a9d5d2..e42695a 100644 --- a/ttbp/config/__init__.py +++ b/ttbp/config/__init__.py @@ -24,8 +24,8 @@ if not os.path.isdir(VAR): if not os.path.isdir(VAR_WWW): os.mkdir(VAR_WWW) -LIVE = 'https://tilde.town/~' -FEEDBOX = "endorphant@tilde.town" +LIVE = 'https://tilde.club/~' +FEEDBOX = "root@tilde.club" USERFILE = os.path.join(VAR, "users.txt") GRAFF_DIR = os.path.join(VAR, "graffiti") WALL = os.path.join(GRAFF_DIR, "wall.txt") @@ -83,7 +83,7 @@ SUBS = os.path.join(USER_CONFIG, 'subs') BANNER = ''' ___________________________________________________________ | | -| the tilde.town | +| the tilde.club | | ____ ____ ____ _ ____ ____ _ _ ____ _ _ _ ____ | | |___ |___ |___ | [__ |___ |\ | | __ | |\ | |___ | | | |___ |___ |___ ___] |___ | \| |__] | | \| |___ | @@ -98,9 +98,9 @@ ___________________________________________________________ intro_prompt = """ i don't recognize you, stranger. let's make friends. -the feels engine is an internal blogging platform on tilde.town. it assists you +the feels engine is an internal blogging platform on tilde.club. it assists you in recording your feels, giving you the option to publish to html or gopher, and -read the feels of other users on tilde.town. +read the feels of other users on tilde.club. press to set up an account, or to quit. """.lstrip() @@ -108,6 +108,7 @@ press to set up an account, or to quit. credits = """ ttbp was written for tilde.town by ~endorphant in python. the codebase is publicly available on github at https://github.com/modgethanc/ttbp +tilde.club fork is at https://github.com/tildeclub/ttbp tips for development are accepted at https://liberapay.com/modgethanc/ diff --git a/ttbp/config/defaults/header.txt b/ttbp/config/defaults/header.txt index 4f97989..2090154 100644 --- a/ttbp/config/defaults/header.txt +++ b/ttbp/config/defaults/header.txt @@ -6,7 +6,7 @@
    diff --git a/ttbp/config/defaults/style.css b/ttbp/config/defaults/style.css index 204eec7..ec67514 100644 --- a/ttbp/config/defaults/style.css +++ b/ttbp/config/defaults/style.css @@ -1,6 +1,6 @@ body { background-color: #E0B0FF; - font-family: courier + font-family: courier, monospace; } #meta { diff --git a/ttbp/core.py b/ttbp/core.py index d35db94..157017a 100644 --- a/ttbp/core.py +++ b/ttbp/core.py @@ -142,7 +142,7 @@ def write_html(outurl="default.html"): outfile = open(os.path.join(config.WWW, outurl), "w") - outfile.write("\n\n") + outfile.write("\n\n") for line in HEADER: outfile.write(line) @@ -174,7 +174,7 @@ def write_page(filename): outurl = os.path.join(config.WWW, "".join(util.parse_date(filename))+".html") outfile = open(outurl, "w") - outfile.write("\n\n") + outfile.write("\n\n") for line in HEADER: outfile.write(line) @@ -247,18 +247,18 @@ def write_global_feed(blogList): - tilde.town feels engine + tilde.club feels engine
    -

    tilde.town feels engine

    +

    tilde.club feels engine

    -

    github +

    github repo | state of the ttbp

    -

     

    """) diff --git a/ttbp/gopher.py b/ttbp/gopher.py index 17f02a3..fb4f7ee 100644 --- a/ttbp/gopher.py +++ b/ttbp/gopher.py @@ -41,7 +41,7 @@ GOPHERMAP_HEADER = """ this file is automatically generated by ttbp. -0(about ttbp)\t/~endorphant/ttbp.txt\ttilde.town\t70 +0(about ttbp)\t/ttbp.txt\ttilde.club\t70 1(back to user's home)\t/~{user} entries: diff --git a/ttbp/ttbp.py b/ttbp/ttbp.py index 7df3f6e..d103c37 100644 --- a/ttbp/ttbp.py +++ b/ttbp/ttbp.py @@ -224,7 +224,7 @@ def check_init(): print("\n\n") if os.path.exists(os.path.join(os.path.expanduser("~"),".ttbp")): - if config.USER == "endorphant": + if config.USER == "benharri": print("hey boss! :D\n") else: print("{greeting}, {user}".format(greeting=chatter.say("greet"), @@ -302,8 +302,7 @@ def init(): input(""" you're all good to go, {friend}! if you have any questions about how things -work here, check out the documentation from the main menu, ask in IRC, or -drop ~endorphant a line! +work here, check out the documentation from the main menu, or ask in IRC! hit to continue. """.format(friend=chatter.say("friend"))) @@ -327,7 +326,7 @@ def gen_header(): @@ -581,7 +580,7 @@ def main_menu(): redraw("now changing your settings. press if you didn't mean to do this.") core.load(setup()) # reload settings to core elif choice == '7': - redraw("you're about to send mail to ~endorphant about ttbp") + redraw("you're about to send mail to the admins about ttbp") feedback_menu() elif choice == '8': redraw() @@ -611,7 +610,7 @@ def feedback_menu(): if choice in ['0', '1', '2', '3']: cat = SUBJECTS[int(choice)] entered = input(""" -composing a {mail_category} to ~endorphant. +composing a {mail_category} to the admins. press to open an external text editor. mail will be sent once you save and quit. @@ -806,7 +805,7 @@ def view_neighbors(users, prompt, page=0): sortedUsers.append(user[0]) userIndex.append(user[2]) - ans = menu_handler(sortedUsers, "pick a townie to browse their feels, or type 'q' to go home: ", 15, page, SETTINGS.get("rainbows", False), prompt) + ans = menu_handler(sortedUsers, "pick a user to browse their feels, or type 'q' to go home: ", 15, page, SETTINGS.get("rainbows", False), prompt) if ans is not False: (page, choice) = ans @@ -1286,7 +1285,7 @@ def send_feedback(entered, subject="none"): id = "#"+util.genID(3) mail = MIMEText(message) mail['To'] = config.FEEDBOX - mail['From'] = config.USER+"@tilde.town" + mail['From'] = config.USER+"@tilde.club" mail['Subject'] = " ".join(["[ttbp]", subject, id]) m = os.popen("/usr/sbin/sendmail -t -oi", 'w') m.write(mail.as_string()) @@ -1425,11 +1424,11 @@ def subscription_manager(subs, intro=""): if choice is not False: if choice == 0: - prompt = "list of townies recording feels:" + prompt = "list of users recording feels:" redraw(prompt) subs = subscribe_handler(subs, prompt) elif choice == 1: - prompt = "list of townies you're subscribed to:" + prompt = "list of users you're subscribed to:" redraw(prompt) subs = unsubscribe_handler(subs, prompt) else: @@ -1446,7 +1445,7 @@ def unsubscribe_handler(subs, prompt, page=0): subs.sort() - ans = menu_handler(subs, "pick a pal to unsubscribe (or 'q' to cancel): ", 15, page, SETTINGS.get("rainbows", False), "list of townies recording feels:") + ans = menu_handler(subs, "pick a pal to unsubscribe (or 'q' to cancel): ", 15, page, SETTINGS.get("rainbows", False), "list of users recording feels:") if ans is not False: (page,choice) = ans @@ -1473,7 +1472,7 @@ def subscribe_handler(subs, prompt, page=0): candidates.sort() - ans = menu_handler(candidates, "pick a townie to add to your subscriptions (or 'q' to cancel): ", 15, page, SETTINGS.get("rainbows", False), "list of townies recording feels:") + ans = menu_handler(candidates, "pick a user to add to your subscriptions (or 'q' to cancel): ", 15, page, SETTINGS.get("rainbows", False), "list of users recording feels:") if ans is not False: (page, choice) = ans @@ -1659,7 +1658,7 @@ if yes, your feels will be published to a directory of your choice in your public_html. i'll confirm the location of that directory in a moment. -if not, your feels will only be readable from within the tilde.town +if not, your feels will only be readable from within the tilde.club network. if you already have a publishing directory, i'll remove it for you (don't worry, your written entries will still be saved!) @@ -1842,7 +1841,7 @@ def update_user_version(): print(""" * thanks to help from ~vilmibm, ttbp now supports publishing to gopher! * if you enable gopher publishing, feels will automatically publish to - gopher://tilde.town/1/~"""+config.USER+"""/feels + gopher://tilde.club/1/~"""+config.USER+"""/feels """) SETTINGS.update({'gopher': gopher.select_gopher()}) @@ -1877,7 +1876,7 @@ def update_user_version(): }""") print(""" -you're all good to go, """+chatter.say("friend")+"""! please contact ~endorphant if +you're all good to go, """+chatter.say("friend")+"""! please contact the admins if something strange happened to you during this update. """)