Browse Source

Added cabal conf file

Abhinav Sarkar 6 years ago
parent
commit
3c382588e7
8 changed files with 301 additions and 26 deletions
  1. 3
    1
      .gitignore
  2. 202
    0
      LICENSE
  3. 3
    3
      Network/IRC/Client.hs
  4. 1
    1
      Network/IRC/Handlers.hs
  5. 2
    2
      Network/IRC/Main.hs
  6. 17
    19
      Network/IRC/Types.hs
  7. 2
    0
      Setup.hs
  8. 71
    0
      hask-irc.cabal

+ 3
- 1
.gitignore View File

@@ -1,3 +1,5 @@
1 1
 *.hi
2 2
 *.o
3
-Network/IRC/Main
3
+.cabal-sandbox
4
+cabal.sandbox.config
5
+dist

+ 202
- 0
LICENSE View File

@@ -0,0 +1,202 @@
1
+
2
+                                 Apache License
3
+                           Version 2.0, January 2004
4
+                        http://www.apache.org/licenses/
5
+
6
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+   1. Definitions.
9
+
10
+      "License" shall mean the terms and conditions for use, reproduction,
11
+      and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+      "Licensor" shall mean the copyright owner or entity authorized by
14
+      the copyright owner that is granting the License.
15
+
16
+      "Legal Entity" shall mean the union of the acting entity and all
17
+      other entities that control, are controlled by, or are under common
18
+      control with that entity. For the purposes of this definition,
19
+      "control" means (i) the power, direct or indirect, to cause the
20
+      direction or management of such entity, whether by contract or
21
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+      outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+      "You" (or "Your") shall mean an individual or Legal Entity
25
+      exercising permissions granted by this License.
26
+
27
+      "Source" form shall mean the preferred form for making modifications,
28
+      including but not limited to software source code, documentation
29
+      source, and configuration files.
30
+
31
+      "Object" form shall mean any form resulting from mechanical
32
+      transformation or translation of a Source form, including but
33
+      not limited to compiled object code, generated documentation,
34
+      and conversions to other media types.
35
+
36
+      "Work" shall mean the work of authorship, whether in Source or
37
+      Object form, made available under the License, as indicated by a
38
+      copyright notice that is included in or attached to the work
39
+      (an example is provided in the Appendix below).
40
+
41
+      "Derivative Works" shall mean any work, whether in Source or Object
42
+      form, that is based on (or derived from) the Work and for which the
43
+      editorial revisions, annotations, elaborations, or other modifications
44
+      represent, as a whole, an original work of authorship. For the purposes
45
+      of this License, Derivative Works shall not include works that remain
46
+      separable from, or merely link (or bind by name) to the interfaces of,
47
+      the Work and Derivative Works thereof.
48
+
49
+      "Contribution" shall mean any work of authorship, including
50
+      the original version of the Work and any modifications or additions
51
+      to that Work or Derivative Works thereof, that is intentionally
52
+      submitted to Licensor for inclusion in the Work by the copyright owner
53
+      or by an individual or Legal Entity authorized to submit on behalf of
54
+      the copyright owner. For the purposes of this definition, "submitted"
55
+      means any form of electronic, verbal, or written communication sent
56
+      to the Licensor or its representatives, including but not limited to
57
+      communication on electronic mailing lists, source code control systems,
58
+      and issue tracking systems that are managed by, or on behalf of, the
59
+      Licensor for the purpose of discussing and improving the Work, but
60
+      excluding communication that is conspicuously marked or otherwise
61
+      designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+      "Contributor" shall mean Licensor and any individual or Legal Entity
64
+      on behalf of whom a Contribution has been received by Licensor and
65
+      subsequently incorporated within the Work.
66
+
67
+   2. Grant of Copyright License. Subject to the terms and conditions of
68
+      this License, each Contributor hereby grants to You a perpetual,
69
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+      copyright license to reproduce, prepare Derivative Works of,
71
+      publicly display, publicly perform, sublicense, and distribute the
72
+      Work and such Derivative Works in Source or Object form.
73
+
74
+   3. Grant of Patent License. Subject to the terms and conditions of
75
+      this License, each Contributor hereby grants to You a perpetual,
76
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+      (except as stated in this section) patent license to make, have made,
78
+      use, offer to sell, sell, import, and otherwise transfer the Work,
79
+      where such license applies only to those patent claims licensable
80
+      by such Contributor that are necessarily infringed by their
81
+      Contribution(s) alone or by combination of their Contribution(s)
82
+      with the Work to which such Contribution(s) was submitted. If You
83
+      institute patent litigation against any entity (including a
84
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+      or a Contribution incorporated within the Work constitutes direct
86
+      or contributory patent infringement, then any patent licenses
87
+      granted to You under this License for that Work shall terminate
88
+      as of the date such litigation is filed.
89
+
90
+   4. Redistribution. You may reproduce and distribute copies of the
91
+      Work or Derivative Works thereof in any medium, with or without
92
+      modifications, and in Source or Object form, provided that You
93
+      meet the following conditions:
94
+
95
+      (a) You must give any other recipients of the Work or
96
+          Derivative Works a copy of this License; and
97
+
98
+      (b) You must cause any modified files to carry prominent notices
99
+          stating that You changed the files; and
100
+
101
+      (c) You must retain, in the Source form of any Derivative Works
102
+          that You distribute, all copyright, patent, trademark, and
103
+          attribution notices from the Source form of the Work,
104
+          excluding those notices that do not pertain to any part of
105
+          the Derivative Works; and
106
+
107
+      (d) If the Work includes a "NOTICE" text file as part of its
108
+          distribution, then any Derivative Works that You distribute must
109
+          include a readable copy of the attribution notices contained
110
+          within such NOTICE file, excluding those notices that do not
111
+          pertain to any part of the Derivative Works, in at least one
112
+          of the following places: within a NOTICE text file distributed
113
+          as part of the Derivative Works; within the Source form or
114
+          documentation, if provided along with the Derivative Works; or,
115
+          within a display generated by the Derivative Works, if and
116
+          wherever such third-party notices normally appear. The contents
117
+          of the NOTICE file are for informational purposes only and
118
+          do not modify the License. You may add Your own attribution
119
+          notices within Derivative Works that You distribute, alongside
120
+          or as an addendum to the NOTICE text from the Work, provided
121
+          that such additional attribution notices cannot be construed
122
+          as modifying the License.
123
+
124
+      You may add Your own copyright statement to Your modifications and
125
+      may provide additional or different license terms and conditions
126
+      for use, reproduction, or distribution of Your modifications, or
127
+      for any such Derivative Works as a whole, provided Your use,
128
+      reproduction, and distribution of the Work otherwise complies with
129
+      the conditions stated in this License.
130
+
131
+   5. Submission of Contributions. Unless You explicitly state otherwise,
132
+      any Contribution intentionally submitted for inclusion in the Work
133
+      by You to the Licensor shall be under the terms and conditions of
134
+      this License, without any additional terms or conditions.
135
+      Notwithstanding the above, nothing herein shall supersede or modify
136
+      the terms of any separate license agreement you may have executed
137
+      with Licensor regarding such Contributions.
138
+
139
+   6. Trademarks. This License does not grant permission to use the trade
140
+      names, trademarks, service marks, or product names of the Licensor,
141
+      except as required for reasonable and customary use in describing the
142
+      origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+   7. Disclaimer of Warranty. Unless required by applicable law or
145
+      agreed to in writing, Licensor provides the Work (and each
146
+      Contributor provides its Contributions) on an "AS IS" BASIS,
147
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+      implied, including, without limitation, any warranties or conditions
149
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+      PARTICULAR PURPOSE. You are solely responsible for determining the
151
+      appropriateness of using or redistributing the Work and assume any
152
+      risks associated with Your exercise of permissions under this License.
153
+
154
+   8. Limitation of Liability. In no event and under no legal theory,
155
+      whether in tort (including negligence), contract, or otherwise,
156
+      unless required by applicable law (such as deliberate and grossly
157
+      negligent acts) or agreed to in writing, shall any Contributor be
158
+      liable to You for damages, including any direct, indirect, special,
159
+      incidental, or consequential damages of any character arising as a
160
+      result of this License or out of the use or inability to use the
161
+      Work (including but not limited to damages for loss of goodwill,
162
+      work stoppage, computer failure or malfunction, or any and all
163
+      other commercial damages or losses), even if such Contributor
164
+      has been advised of the possibility of such damages.
165
+
166
+   9. Accepting Warranty or Additional Liability. While redistributing
167
+      the Work or Derivative Works thereof, You may choose to offer,
168
+      and charge a fee for, acceptance of support, warranty, indemnity,
169
+      or other liability obligations and/or rights consistent with this
170
+      License. However, in accepting such obligations, You may act only
171
+      on Your own behalf and on Your sole responsibility, not on behalf
172
+      of any other Contributor, and only if You agree to indemnify,
173
+      defend, and hold each Contributor harmless for any liability
174
+      incurred by, or claims asserted against, such Contributor by reason
175
+      of your accepting any such warranty or additional liability.
176
+
177
+   END OF TERMS AND CONDITIONS
178
+
179
+   APPENDIX: How to apply the Apache License to your work.
180
+
181
+      To apply the Apache License to your work, attach the following
182
+      boilerplate notice, with the fields enclosed by brackets "[]"
183
+      replaced with your own identifying information. (Don't include
184
+      the brackets!)  The text should be enclosed in the appropriate
185
+      comment syntax for the file format. We also recommend that a
186
+      file or class name and description of purpose be included on the
187
+      same "printed page" as the copyright notice for easier
188
+      identification within third-party archives.
189
+
190
+   Copyright [yyyy] [name of copyright owner]
191
+
192
+   Licensed under the Apache License, Version 2.0 (the "License");
193
+   you may not use this file except in compliance with the License.
194
+   You may obtain a copy of the License at
195
+
196
+       http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+   Unless required by applicable law or agreed to in writing, software
199
+   distributed under the License is distributed on an "AS IS" BASIS,
200
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+   See the License for the specific language governing permissions and
202
+   limitations under the License.

+ 3
- 3
Network/IRC/Client.hs View File

@@ -8,7 +8,7 @@ import Control.Exception
8 8
 import Control.Concurrent
9 9
 import Control.Monad.Reader
10 10
 import Network
11
-import Prelude hiding (log)
11
+import Prelude hiding (log, catch)
12 12
 import System.IO
13 13
 import System.Time
14 14
 import System.Timeout
@@ -25,7 +25,7 @@ oneSec = 1000000
25 25
 
26 26
 io = liftIO
27 27
 
28
-log msg = putStrLn $ "** " ++ msg
28
+log msg = getClockTime >>= \t -> printf "[%s] ** %s\n" (show t) msg
29 29
 
30 30
 sendCommand :: Bot -> Command -> IO ()
31 31
 sendCommand Bot { .. } reply = do
@@ -91,7 +91,7 @@ run :: BotConfig -> IO ()
91 91
 run botConfig = withSocketsDo $ do
92 92
   status <- run_
93 93
   case status of
94
-    Disconnected -> log "Connection timedout" >> run botConfig
94
+    Disconnected -> log "Connection timed out" >> run botConfig
95 95
     Errored      -> return ()
96 96
   where
97 97
     run_ = bracket (connect botConfig) disconnect $ \bot ->

+ 1
- 1
Network/IRC/Handlers.hs View File

@@ -13,7 +13,7 @@ import Network.IRC.Types
13 13
 (++) = append
14 14
 
15 15
 handleMessage :: HandlerName -> Handler
16
-handleMessage "greeter" = greeter
16
+handleMessage "greeter"  = greeter
17 17
 handleMessage "welcomer" = welcomer
18 18
 
19 19
 greeter bot ChannelMsg { .. } = case L.find (== clean msg) greetings of

+ 2
- 2
Network/IRC/Main.hs View File

@@ -1,4 +1,4 @@
1
-module Network.IRC.Main(main) where
1
+module Main(main) where
2 2
 
3 3
 import qualified Data.Text as T
4 4
 
@@ -21,4 +21,4 @@ main = do
21 21
 
22 22
   if length args < 4
23 23
     then putStrLn ("Usage: " ++ prog ++ " <server> <port> <channel> <nick>") >> exitFailure
24
-    else run $ BotConfig server port channel botNick 120 handlers
24
+    else run $ BotConfig server port channel botNick 180 handlers

+ 17
- 19
Network/IRC/Types.hs View File

@@ -14,35 +14,33 @@ data User = Self | User { userNick :: Nick, userServer :: Text }
14 14
             deriving (Show, Eq)
15 15
 
16 16
 data Message =
17
-    ChannelMsg { time :: ClockTime, user :: User, msg :: Text }
18
-  | PrivMsg    { time :: ClockTime, user :: User, msg :: Text }
19
-  | Ping       { time :: ClockTime, msg :: Text }
20
-  | JoinMsg    { time :: ClockTime, user :: User }
21
-  | ModeMsg    { time :: ClockTime, user :: User, target :: Text
22
-               , mode :: Text, modeArgs :: [Text] }
23
-  | NickMsg    { time :: ClockTime, user :: User, nick :: Text }
24
-  | QuitMsg    { time :: ClockTime, user :: User, msg :: Text }
25
-  | PartMsg    { time :: ClockTime, user :: User, msg :: Text }
26
-  | KickMsg    { time :: ClockTime, user :: User, msg :: Text }
27
-  | OtherMsg   { time :: ClockTime, source :: Text, command :: Text
28
-               , target :: Text, msg :: Text }
17
+  ChannelMsg { time   :: ClockTime, user   :: User, msg     :: Text }
18
+  | PrivMsg    { time :: ClockTime, user   :: User, msg     :: Text }
19
+  | Ping       { time :: ClockTime, msg    :: Text }
20
+  | JoinMsg    { time :: ClockTime, user   :: User }
21
+  | ModeMsg    { time :: ClockTime, user   :: User, target  :: Text , mode   :: Text, modeArgs :: [Text] }
22
+  | NickMsg    { time :: ClockTime, user   :: User, nick    :: Text }
23
+  | QuitMsg    { time :: ClockTime, user   :: User, msg     :: Text }
24
+  | PartMsg    { time :: ClockTime, user   :: User, msg     :: Text }
25
+  | KickMsg    { time :: ClockTime, user   :: User, msg     :: Text }
26
+  | OtherMsg   { time :: ClockTime, source :: Text, command :: Text , target :: Text, msg      :: Text }
29 27
   deriving (Show, Eq)
30 28
 
31 29
 data Command =
32
-    Pong            { rmsg :: Text }
33
-  | ChannelMsgReply { rmsg :: Text }
30
+    Pong            { rmsg  :: Text }
31
+  | ChannelMsgReply { rmsg  :: Text }
34 32
   | PrivMsgReply    { ruser :: User, rmsg :: Text }
35 33
   | NickCmd
36 34
   | UserCmd
37 35
   | JoinCmd
38 36
   deriving (Show, Eq)
39 37
 
40
-data BotConfig = BotConfig { server :: String
41
-                           , port :: Int
42
-                           , channel :: Text
43
-                           , botNick :: Text
38
+data BotConfig = BotConfig { server     :: String
39
+                           , port       :: Int
40
+                           , channel    :: Text
41
+                           , botNick    :: Text
44 42
                            , botTimeout :: Int
45
-                           , handlers :: [HandlerName] }
43
+                           , handlers   :: [HandlerName] }
46 44
                  deriving (Show, Eq)
47 45
 data Bot = Bot { botConfig :: BotConfig, socket :: Handle } deriving (Show, Eq)
48 46
 

+ 2
- 0
Setup.hs View File

@@ -0,0 +1,2 @@
1
+import Distribution.Simple
2
+main = defaultMain

+ 71
- 0
hask-irc.cabal View File

@@ -0,0 +1,71 @@
1
+-- Initial hask-irc.cabal generated by cabal init.  For further
2
+-- documentation, see http://haskell.org/cabal/users-guide/
3
+
4
+-- The name of the package.
5
+name:                hask-irc
6
+
7
+-- The package version.  See the Haskell package versioning policy (PVP)
8
+-- for standards guiding when and how versions should be incremented.
9
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
10
+-- PVP summary:      +-+------- breaking API changes
11
+--                   | | +----- non-breaking API additions
12
+--                   | | | +--- code changes with no API change
13
+version:             0.1.0
14
+
15
+-- A short (one-line) description of the package.
16
+synopsis:            A simple extensible IRC bot
17
+
18
+-- A longer description of the package.
19
+-- description:
20
+
21
+-- URL for the project homepage or repository.
22
+homepage:            https://github.com/abhin4v/hask-irc
23
+
24
+-- The license under which the package is released.
25
+license:             Apache-2.0
26
+
27
+-- The file containing the license text.
28
+license-file:        LICENSE
29
+
30
+-- The package author(s).
31
+author:              Abhinav Sarkar
32
+
33
+-- An email address to which users can send suggestions, bug reports, and
34
+-- patches.
35
+maintainer:          abhinav@abhinavsarkar.net
36
+
37
+-- A copyright notice.
38
+-- copyright:
39
+
40
+category:            Network
41
+
42
+build-type:          Simple
43
+
44
+-- Extra files to be distributed with the package, such as examples or a
45
+-- README.
46
+-- extra-source-files:
47
+
48
+-- Constraint on the version of Cabal needed to build this package.
49
+cabal-version:       >=1.10
50
+
51
+
52
+executable hask-irc
53
+  -- .hs or .lhs file containing the Main module.
54
+  main-is:             Network/IRC/Main.hs
55
+
56
+  -- Modules included in this executable, other than Main.
57
+  -- other-modules:
58
+
59
+  -- LANGUAGE extensions used by modules in this package.
60
+  other-extensions:    RecordWildCards, OverloadedStrings, ScopedTypeVariables
61
+
62
+  -- Other library packages from which modules are imported.
63
+  build-depends:       base >=4.6 && <4.7, text >=0.11 && <0.12, mtl >=2.1 && <2.2,
64
+                       network >=2.4 && <2.5, old-time >=1.1 && <1.2
65
+
66
+  -- Directories containing source files.
67
+  -- hs-source-dirs:
68
+
69
+  -- Base language which the package is written in.
70
+  default-language:    Haskell2010
71
+

Loading…
Cancel
Save