summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@shack.(none)>2010-05-07 04:51:31 +0200
committerroot <root@shack.(none)>2010-05-07 04:51:31 +0200
commite164088a38e067b4456cf131a260e3cdd90d0fb3 (patch)
treeea4cff25143181f66053d2e4367deea656d62388
parent8b7cd604d16b5f01128dda2927dde2c8dfe1f2dd (diff)
parentbd0a3e505cb4384101a4a044fe52a6a1ed4d5e7f (diff)
Merge branch 'master' of /home/shack/noise
-rw-r--r--.gitignore1
-rwxr-xr-xmodules/query23
-rwxr-xr-xmodules/twitter8
3 files changed, 29 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..81154dd4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+samples
diff --git a/modules/query b/modules/query
new file mode 100755
index 00000000..ceeff8a5
--- /dev/null
+++ b/modules/query
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+case "$1" in
+ (--help) echo send a message to a specific user ;;
+ (*)
+ cd /tmp/noise
+ . $NOISE_pid/environment
+ nick="${chat_nick-$NOISE_pid}"
+ target="$1"
+ shift
+ for client in * ; do
+ . $client/environment
+ if test "$target" = "${chat_nick-$client}" ; then
+ echo "/echo <-- $nick: $*" > $client/linefeed
+ echo "--> $target: $*"
+ exit
+ fi
+ unset chat_channel
+
+ done
+
+ echo "$nick not found"
+esac
diff --git a/modules/twitter b/modules/twitter
index fa4d366d..49d092fb 100755
--- a/modules/twitter
+++ b/modules/twitter
@@ -22,6 +22,7 @@ def shorten(text):
text = text.replace(" years", "y")
text = text.replace(" year", "y")
text = text.replace(" ago", "")
+ text = text.replace("a", "1")
return text
@@ -93,6 +94,7 @@ else:
a.reverse()
for i in a:
text = i.text
+ ilen = len(i.user.screen_name) + len(shorten(i.GetRelativeCreatedAt())) + 2
if i.user.screen_name.lower() == "shackspace" or i.user.screen_name.lower() == "shackspam":
info = "" + i.user.screen_name + " " + shorten(i.GetRelativeCreatedAt()) + ""
else:
@@ -102,12 +104,12 @@ else:
t = text.split(" ")
tmp = ""
for n in t:
- if ((len(tmp) + len(n)) > 80):
+ if ((len(tmp) + len(n)) >= 80):
print parse(tmp).encode("utf8")
- tmp = " " *( len(info)-15)
+ tmp = " " * ilen
tmp += " " + n
- if len(tmp) > (len(info)-15+1):
+ if len(tmp) > ilen:
print parse(tmp).encode("utf8")