Skip to content

Merge python3.4 into merging-from-obr #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dmptrluke wants to merge 5 commits into from
Closed

Merge python3.4 into merging-from-obr #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05ee2a0
Erm.. was that a type?
pangeacake Jan 14, 2015
aa57bc5
Add /log to .gitignore to avoid any more nasty accidents
dmptrluke Jan 14, 2015
3d8430f
ಠ_ಠ
dmptrluke Jan 14, 2015
c0a2184
Update utility.py
dmptrluke Jan 15, 2015
9d05a90
Merge pull request #60 from PangeaCake/patch-1
dmptrluke Jan 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ target/

# Cloudbot
persist/
logs/
config.json
*.db
*.log
Expand Down
1 change: 1 addition & 0 deletions cloudbot/hook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,4 +297,5 @@ def _on_start_hook(func):
return lambda func: _on_start_hook(func)


# this is temporary, to ease transition
onload = on_start
2 changes: 1 addition & 1 deletion plugins/correction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def correction(match, conn, chan, message):
mod_msg = find_re.sub("\x02" + replacement + "\x02", msg, count=int("g" not in flags))
message("Correction, {}".format(("<{}> " if not is_action else "* {}").format(nick) + mod_msg))
# append to end of history file
msg = find_re.sub(replacement, msg, count=int("g not" in flags))
msg = find_re.sub(replacement, msg, count=int("g" not in flags))
conn.history[chan].append((nick, timestamp, msg))
return
else:
Expand Down
2 changes: 1 addition & 1 deletion plugins/utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def derpify(text):
"WHAT THE": "WT", "WHAT": "WUT", "ARE": "R", "WHY": "Y", "BE RIGHT BACK": "BRB", "BECAUSE": "B/C",
"OH MY GOD": "OMG", "O": "OH", "THE": pick_the, "TOO": "2", "TO": "2", "BE": "B", "CK": "K", "ING": "NG",
"PLEASE": "PLS", "SEE YOU": "CYA", "SEE YA": "CYA", "SCHOOL": "SKOOL", "AM": "M",
"AM GOING TO": "IAM GOING TO",
"AM GOING TO": "IAM GOING TO", "THAT": "DAT", "ICK": "IK",
"LIKE": "LIEK", "HELP": "HALP", "KE": "EK", "E": pick_e, "!": pick_ex, "?": pick_qt}
output = translate(string, rules) + " " + pick_end

Expand Down