stats/index.php

@@ -1,35 +1,19 @@
-<?php 
-$title="stats page";
+<?php $title="stats page";
 $desc="stats about tilde.chat and its channels";
-$stats = json_decode(file_get_contents("../stats.json"));
-include __DIR__."/../header.php"; 
-?>
-
+include __DIR__."/../header.php"; ?>
 	<h1>stats</h1>
-	<hr>
+<?php
+	$stats = json_decode(file_get_contents("../stats.json"));
+?>
 	<p>There are <?=$stats->usercount?> users across <?=$stats->channelcount?> channels.</p>
-	<div class="table-responsive">
-		<table class="table table-striped table-bordered table-hover">
-			<thead>
-				<tr>
-					<th>Name</th>
-					<th>Users</th>
-					<th>Topic</th>
-				</tr>
-			</thead>
-
-			<tbody data-link="row" class="rowlink">
-				<?php foreach($stats->channels as $channel): ?>
-					<tr>
-						<td><a href="<?=$channel->webchatlink?>"><?=$channel->name?></a></td>
-						<td><?=$channel->usercount?></td>
-						<td style="word-wrap: break-word; white-space: pre-wrap; max-width:700px"><?=$channel->topic?></td>
-					</tr>
-				<?php endforeach; ?>
-			</tbody>
-		</table>
-	</div>
+	<table class='table table-striped table-bordered table-hover'>
+		<thead><tr><th>Name</th><th>Users</th><th>Topic</th></tr></thead>
+		<tbody data-link="row" class="rowlink">
+<?php	foreach($stats->channels as $channel): ?>
+			<tr><td><a href="<?=$channel->webchatlink?>"><?=$channel->name?></a></td><td><?=$channel->usercount?></td><td><?=$channel->topic?></td></tr>
+<?php endforeach; ?>
+		</tbody>
+	</table>
 	<hr>
 	<p>Available in <a href="/stats.json">JSON format</a>.</p>
-
 <?php include __DIR__."/../footer.php"; ?>

wiki/pages/bots.md

@@ -41,4 +41,25 @@ follow the example of sedbot when you add your bot in a PR to the wiki
         + s/needle/replace/flags
         + most regex character classes match here
         + flags include `g` and `i`
+<<<<<<< HEAD
     - [source](https://tildegit.org/ben/sedbot)
+=======
+<<<<<<< HEAD
+    - [source](https://git.tildeverse.org/ben/sedbot)
+>>>>>>> Rebasing and squashing
+* BabiliBot
+    - botmaster: [~aewens](https://aewens.tilde.team)
+    - short description: the unofficial bot of #meta, also includes integrations such as mirroring tilde.news and `bbj` into #tildeverse and #team (respectively)
+    - list of functions:
+        + !summon <user> <reason> -- Sends email to user to summon them
+        + !hmmscore <user:optional> -- How many times user has said "hmm"
+        + !oofscore <user:optional> -- How many times user has said "oof"
+        + !hmmscoreboard / !oofscoreboard -- Top three scores
+        + !whois <domain> -- Does a WHOIS search to see if domain is registered or not
+    - [source](https://tildegit.org/aewens/babili-bot)
+<<<<<<< HEAD
+=======
+=======
+    - [source](https://tildegit.org/ben/sedbot)
+>>>>>>> ceb3ccb... update some links and wiki
+>>>>>>> Rebasing and squashing