From 94465c2535684deb206a94383e2a12d9def3958e Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Thu, 16 Aug 2018 00:27:46 -0400
Subject: [PATCH] refactor a bit and add some services to the list

---
 footer.php                           |  1 -
 wiki/README.md                       |  8 +++++--
 wiki/index.php                       | 32 ++++++++++++++--------------
 wiki/pages/administration.md         |  2 --
 wiki/pages/email.md                  | 10 +++++----
 wiki/pages/gopher.md                 |  2 +-
 wiki/pages/irc-bots.md               | 18 ++++++++++------
 wiki/pages/learning-opportunities.md | 12 +++++------
 wiki/pages/services.md               | 12 +++++++----
 9 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/footer.php b/footer.php
index cb4410a..e1a7c22 100644
--- a/footer.php
+++ b/footer.php
@@ -1,6 +1,5 @@
         <hr>
     </div>
-    <footer class="text-center"><a href="/wiki/?page=code-of-conduct">code of conduct</a></footer>
 
     <br>
     <br>
diff --git a/wiki/README.md b/wiki/README.md
index 362138a..a4e94ab 100644
--- a/wiki/README.md
+++ b/wiki/README.md
@@ -4,9 +4,11 @@ hi there, welcome to our wiki!
 
 to contribute to the wiki:
 
+* [fork the repo](https://git.tildeverse.org/repo/fork/1)
+
 * clone the repo to your local machine (or your public_html folder on the tilde.team box for live testing)
 ```sh
-git clone git@tilde.team:team/site
+git clone git@tilde.team:yourusername/site
 ```
 
 * create a new branch for your page
@@ -21,7 +23,7 @@ cp template.md my-new-page.md
 
 * edit as needed!
 
-* commit your changes and create a pull request :)
+* commit your changes and [create a pull request](https://git.tildeverse.org/team/site/pulls) :)
 ```sh
 git add --all
 git commit -m "added my-new-page"
@@ -31,3 +33,5 @@ git push origin my-new-page # this should match the branch name you created earl
 * create a pull request on the [site](https://git.tilde.team/team/site) repo
 
 thanks!~
+
+ps. if you have any questions, ask on irc! (preferably in #team)
diff --git a/wiki/index.php b/wiki/index.php
index 28f801d..20ee8d5 100644
--- a/wiki/index.php
+++ b/wiki/index.php
@@ -1,16 +1,19 @@
 <?php
 require __DIR__.'/../vendor/autoload.php';
 
-$additional_head = '
-<style>
-:target:before {
-    content:"";
-    display:block;
-    height:90px; /* fixed header height*/
-    margin:-90px 0 0; /* negative fixed header height */
-}
-</style>
-';
+$additional_head = "
+    <style>
+    :target:before {
+        content:\"\";
+        display:block;
+        height:90px; /* fixed header height*/
+        margin:-90px 0 0; /* negative fixed header height */
+    }
+    </style>
+    <meta property='og:type' content='website'>
+    <meta property='og:image' content='https://tilde.team/apple-icon.png'>
+    <meta property='og:site_name' content='tilde.team wiki'>
+";
 
 class MDParser implements Mni\FrontYAML\Markdown\MarkdownParser {
     public function __construct() {
@@ -29,14 +32,12 @@ $parser = new Mni\FrontYAML\Parser(null, new MDParser());
 
 
 if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
+
     $title = "tilde.team~wiki";
     $additional_head .= "
     <meta property='og:title' content='$title'>
-    <meta property='og:type' content='website'>
-    <meta property='og:image' content='https://tilde.team/apple-icon.png'>
     <meta property='og:url' content='https://tilde.team{$_SERVER['REQUEST_URI']}'>
     <meta property='og:description' content='tilde.team wiki'>
-    <meta property='og:site_name' content='tilde.team wiki'>
     ";
     include __DIR__.'/../header.php';
     // render wiki index ?>
@@ -60,17 +61,15 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
     <?php }
 
 } else {
+
     $pg = $parser->parse(file_get_contents("pages/{$_GET["page"]}.md"));
     $yml = $pg->getYAML();
     $title = $yml['title'] . " | tilde.team~wiki";
     $description = $yml['description'] ?? "tilde.team wiki article {$yml['title']}";
     $additional_head .= "
     <meta property='og:title' content='$title'>
-    <meta property='og:type' content='website'>
-    <meta property='og:image' content='https://tilde.team/apple-icon.png'>
     <meta property='og:url' content='https://tilde.team{$_SERVER['REQUEST_URI']}'>
     <meta property='og:description' content='$description'>
-    <meta property='og:site_name' content='tilde.team wiki'>
     ";
     include __DIR__.'/../header.php';
     // show a single page ?>
@@ -83,6 +82,7 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
     <a href="https://git.tildeverse.org/team/site/src/branch/master/wiki/pages/<?=$_GET["page"]?>.md">
         <i class="fa fa-edit"></i> source
     </a>
+
 <?php }
 
 include __DIR__.'/../footer.php';
diff --git a/wiki/pages/administration.md b/wiki/pages/administration.md
index 5e8ba60..d432c00 100644
--- a/wiki/pages/administration.md
+++ b/wiki/pages/administration.md
@@ -8,7 +8,6 @@ category:
 ---
 
 # administration
----
 
 
 ## adding users
@@ -73,7 +72,6 @@ welcome mail template:
 
 
 
----
 ## backups
 
 tilde.team uses [tarsnap](https://tarsnap.com) for backups and is configured to save 12 hourly backups, 7 daily backups, 6 weekly backups, and 2 years' worth of monthly backups.
diff --git a/wiki/pages/email.md b/wiki/pages/email.md
index 2025680..a259782 100644
--- a/wiki/pages/email.md
+++ b/wiki/pages/email.md
@@ -22,14 +22,16 @@ you have a couple options:
 
 * imap/smtp
     - email address: username@tilde.team (or any of the aliased domains)
-    - username: username
+    - username: username (without the domain)
     - password: your shell password
     - imap: imap.tilde.team port 143 (starttls)
     - smtp: smtp.tilde.team port 587 (starttls)
+    - (any subdomain of tilde.team works for smtp and imap. just make sure you have tls selected)
 
 ---
 
-because [~ben](https://tilde.team/~ben/) likes to buy domain names, you can use the following domains as aliases for your inbox:
+because [~ben](https://tilde.team/~ben/) likes to buy domain names, you can use the following domains with your tildemail:
+
 * tilde.zone
 * tilde.chat
 * tilde.site
@@ -37,8 +39,8 @@ because [~ben](https://tilde.team/~ben/) likes to buy domain names, you can use
 * tildenet.org
 * tildeverse.org
 
-mail sent to your_username@ any of those domains will end up in your inbox. most clients will allow you to add additional identities/aliases. 
-additionally, any address with a `-` or `+` and arbitrary text behind it will be forwarded to you email: ie. your_username+somethingcool@tildeverse.org or your_username-notcool@tilde.site.
+mail sent to yourusername@ any of those domains will end up in your inbox. most clients will allow you to add additional identities/aliases. 
+additionally, any address with a `-` or `+` and arbitrary text behind it will be forwarded to you email: ie. `your_username+somethingcool@tildeverse.org` or `yourusername-notcool@tilde.site`.
 feel free to use as many as you'd like :)
 
 if you would like your tildemail to be forwarded somewhere else, put that email address in ~/.forward
diff --git a/wiki/pages/gopher.md b/wiki/pages/gopher.md
index a264355..9f99e8d 100644
--- a/wiki/pages/gopher.md
+++ b/wiki/pages/gopher.md
@@ -2,7 +2,7 @@
 author: ~ben
 published: true
 title: gopher
-description: tilde.team gopher server and proxy
+description: gopher server and proxy
 category: 
     - main
 ---
diff --git a/wiki/pages/irc-bots.md b/wiki/pages/irc-bots.md
index 9563b9f..97393ad 100644
--- a/wiki/pages/irc-bots.md
+++ b/wiki/pages/irc-bots.md
@@ -13,7 +13,7 @@ tilde.team is a place for socializing, learning, and making cool stuff. one fun
 
 if you keep your bots clean and efficient, your irc bots are welcome on tilde.team.
 
-bots should be well behaved and efficient with system resources. if you see a bot that is not, please remind the botmaster about this and/or notify an admin.  naughty bots can make the system less enjoyable for everyone, and we all have to work together to police them.
+bots should be well behaved and efficient with system resources. if you see a bot that is not, please remind the botmaster about this and/or notify an admin. naughty bots can make the system less enjoyable for everyone, and we all have to work together to police them.
 
 ## rules and etiquette for tilde.team irc bots
 
@@ -28,13 +28,17 @@ if your bot's code is not stable, keep it in the #bots channel and do testing th
 
 ## tilde.team bot starter kit
 
-khuxkm is hard at work developing a starter kit framework in python that you can use to build your own irc bot.  once it is available, you'll be able to find more information about it here.  you will also find a link to the tilde.team gitea repo for access to the source code.
+[khuxkm](https://khuxkm.tilde.team) is hard at work developing a starter kit framework in python that you can use to build your own irc bot. find the [source here](https://git.tildeverse.org/team/teambot). it's installed globally, so get coding!
 
 ## add your bot to the list below
 
--- template --  
-bot name:  
-botmaster:  
-short description:  
-list of functions:  
+follow the example of sedbot when you add your bot in a PR to the wiki
 
+* sedbot
+    - botmaster: [~ben](https://ben.tilde.team)
+    - short description: sent a typo in chat? fix it up with a sed expression and sedbot will try to correct it
+    - list of functions:
+        + s/needle/replace/flags
+        + most regex character classes match here
+        + flags include `g` and `i`
+    - [source](https://git.tildeverse.org/ben/sedbot)
diff --git a/wiki/pages/learning-opportunities.md b/wiki/pages/learning-opportunities.md
index 86a838e..7fdf383 100644
--- a/wiki/pages/learning-opportunities.md
+++ b/wiki/pages/learning-opportunities.md
@@ -11,21 +11,21 @@ category: education
 
 ## Coding Challenge Websites
 
-There are many coding challenge websites on the Internet today.  below are a few of them.  the tilde.team shell is a great place to work on solutions to the challenges. 
+There are many coding challenge websites on the Internet today. below are a few of them. the tilde.team shell is a great place to work on solutions to the challenges. 
 
 Please, just be mindful of efficient coding practices while working on these.
 
-* Exercism - http://exercism.io/  
-* Project Euler - https://projecteuler.net/  
-* Advent Of Code - https://adventofcode.com/
+* [Exercism](http://exercism.io/)
+* [Project Euler](https://projecteuler.net/)
+* [Advent Of Code](https://adventofcode.com/)
 
 ## Internships and Other Developmental Opportunities
 
 ### Formlabs 
 
-* https://formlabs.com/company/careers/job/82446/apply/
+* [https://formlabs.com/company/careers/job/82446/apply/](https://formlabs.com/company/careers/job/82446/apply/)
 
-* https://formlabs.com/company/careers/job/656906/apply/
+* [https://formlabs.com/company/careers/job/656906/apply/](https://formlabs.com/company/careers/job/656906/apply/)
 
 ## This Page Is Built Based On Your Input!
 
diff --git a/wiki/pages/services.md b/wiki/pages/services.md
index 3a4b6d2..f537eb6 100644
--- a/wiki/pages/services.md
+++ b/wiki/pages/services.md
@@ -14,7 +14,7 @@ i'll keep this wiki page updated with the services that are running on our littl
 
 ### our deployed projects
 
-* [forum](https://forum.tilde.team) ([source](https://git.tilde.team/meta/forum))
+* [forum](https://forum.tilde.team) ([source](https://git.tilde.team/team/forum)) - mostly defunct in favor of bbj
 
 
 ### code related stuff
@@ -34,12 +34,16 @@ i'll keep this wiki page updated with the services that are running on our littl
     - [file drop](https://pad.tilde.team/file/)
     - [todo lists](https://pad.tilde.team/todo/)
 * [paste bin](https://paste.tilde.team)
+* [nullpointer fileshare](https://0x0.tilde.team)
+* [termbin](https://bin.tilde.team)
 
 
 ### social/communications
 
 * [irc](https://tilde.chat) tilde.chat irc network for the tildeverse
 * [mastodon](https://tilde.zone) federated social network
-    - [pinafore front-end](https://pinafore.tilde.team)
-    - [halcyon front-end](https://halcyon.tilde.team)
-* [email](?page=email) (webmail, smtp/imap, mutt, and alpine)
+    - [pinafore front-end](https://pinafore.tilde.zone)
+    - [halcyon front-end](https://halcyon.tilde.zone)
+* [email](?page=email) ([webmail](https://mail.tilde.team), smtp/imap, mutt, and alpine)
+* [bbj](https://git.tildeverse.org/team/bbj) ([web mirror here](https://bbj.tilde.team)) - forked from [desvox/bbj](https://github.com/desvox/bbj)
+* [gopher proxy](https://gopher.tilde.team)