From 3004d38522ad5ae488f5a200a3f9d383eb92bf0b Mon Sep 17 00:00:00 2001 From: Jacob Henry Date: Mon, 24 Oct 2016 15:36:28 +0000 Subject: [PATCH 1/2] Fixed call of the void api token read. Updated WaitonUtil sheet id, will probably need to change again as year goes on. --- CallOfTheVoid.py | 4 ++-- WaitonUtil.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CallOfTheVoid.py b/CallOfTheVoid.py index c43ce58..e4b119b 100644 --- a/CallOfTheVoid.py +++ b/CallOfTheVoid.py @@ -3,9 +3,9 @@ from slackclient import SlackClient #One last call from beyond the grave apifile = open("apitoken.txt", 'r') -SLACK_API = next(apifile) +SLACK_API = next(apifile).strip() apifile.close(); slack = SlackClient(SLACK_API) -slack.api_call("chat.postMessage", channel="@jacobhenry", text="Alas poor yorrick. I died!") +slack.api_call("chat.postMessage", channel="@jacobhenry", text="one error. and im die?") diff --git a/WaitonUtil.py b/WaitonUtil.py index 3804889..e79bf5b 100644 --- a/WaitonUtil.py +++ b/WaitonUtil.py @@ -7,7 +7,8 @@ Only really kept separate for neatness sake. """ #ID of waiton sheet on drive -WAITON_SHEET_ID = "1J3WDe-OI7YjtDv6mMlM1PN3UlfZo8_y9GBVNBEPwOhE" +#WAITON_SHEET_ID = "1J3WDe-OI7YjtDv6mMlM1PN3UlfZo8_y9GBVNBEPwOhE" #A term 2016 +WAITON_SHEET_ID = "1I4keh9cIt0x-WwZAdnBsZefSZV-tMIAy37r2NLUOLh4" #First week b term From 301c59f569149c05f25f6a2912b1a8a64224d72a Mon Sep 17 00:00:00 2001 From: Jacob Henry Date: Tue, 25 Oct 2016 16:38:40 +0000 Subject: [PATCH 2/2] Added nibs to scroll list --- sortedfamilytree.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sortedfamilytree.txt b/sortedfamilytree.txt index e7e9ecf..b61d5f4 100644 --- a/sortedfamilytree.txt +++ b/sortedfamilytree.txt @@ -723,3 +723,26 @@ 1008: Andrew Brunelle 1009: Ziyang "Gavin" Yu 1010: Tucker Martin +1011: Tejas Rao +1012: Matthew Collins +1014: Andrew Gregory +1015: John Bonina +1016: Sean McCluskey +1017: Jacob Rems +1018: James McAleese +1019: Jacob Henry +1020: James Taylor +1021: Ryan St. Hilaire +1022: Jimmy Tran +1024: Brent Reissman +1025: David Cadilek +1026: James Owens +1027: Diego Infanzon +1028: Trevor Alexander +1029: Nikolas Gamarra +1040: Ryan O'Brien +1041: Chenggu Wang +1041: Johnny Wang +1042: Howard Vance +1044: Evan Hasenfeld +1045: Kien Nhan