2 files changed, 34 insertions, 31 deletions

diff --git a/src/Network/BitTorrent/Tracker/Message.hs b/src/Network/BitTorrent/Tracker/Message.hs
index de12a1fa..edafdaba 100644
--- a/src/Network/BitTorrent/Tracker/Message.hs
+++ b/src/Network/BitTorrent/Tracker/Message.hs
@@ -59,11 +59,12 @@ module Network.BitTorrent.Tracker.Message
        , defaultAnnouncePath
        , defaultScrapePath
 
-         -- ** Request
-       , AnnounceQueryExt (..)
-       , renderAnnounceQueryExt
-       , parseAnnounceQueryExt
+         -- ** Preferences
+       , AnnouncePrefs (..)
+       , renderAnnouncePrefs
+       , parseAnnouncePrefs
 
+         -- ** Request
        , AnnounceRequest  (..)
        , parseAnnounceRequest
        , renderAnnounceRequest
@@ -654,8 +655,10 @@ type ScrapeInfo = [(InfoHash, ScrapeEntry)]
 --  HTTP specific
 -----------------------------------------------------------------------}
 
--- | Extensions for HTTP tracker protocol.
-data AnnounceQueryExt = AnnounceQueryExt
+-- | Some HTTP trackers allow to choose prefered representation of the
+-- 'AnnounceInfo'. It's optional for trackers to honor any of this
+-- options.
+data AnnouncePrefs = AnnouncePrefs
   { -- | If specified, "compact" parameter is used to advise the
     --   tracker to send peer id list as:
     --
@@ -680,11 +683,11 @@ data AnnounceQueryExt = AnnounceQueryExt
   , extNoPeerId :: !(Maybe Bool)
   } deriving (Show, Eq, Typeable)
 
-instance Default AnnounceQueryExt where
-  def = AnnounceQueryExt Nothing Nothing
+instance Default AnnouncePrefs where
+  def = AnnouncePrefs Nothing Nothing
 
-instance QueryLike AnnounceQueryExt where
-  toQuery AnnounceQueryExt {..} =
+instance QueryLike AnnouncePrefs where
+  toQuery AnnouncePrefs {..} =
       [ ("compact",    toQueryFlag <$> extCompact) -- TODO use 'paramName'
       , ("no_peer_id", toQueryFlag <$> extNoPeerId)
       ]
@@ -693,32 +696,32 @@ instance QueryLike AnnounceQueryExt where
       toQueryFlag True  = "1"
 
 -- | Parse announce query extended part from query string.
-parseAnnounceQueryExt :: SimpleQuery -> AnnounceQueryExt
-parseAnnounceQueryExt params = either (const def) id $
-  AnnounceQueryExt
+parseAnnouncePrefs :: SimpleQuery -> AnnouncePrefs
+parseAnnouncePrefs params = either (const def) id $
+  AnnouncePrefs
     <$> optParam ParamCompact  params
     <*> optParam ParamNoPeerId params
 
--- | Render announce query extended part to query string.
-renderAnnounceQueryExt :: AnnounceQueryExt -> SimpleQuery
-renderAnnounceQueryExt = queryToSimpleQuery . toQuery
+-- | Render announce preferences to query string.
+renderAnnouncePrefs :: AnnouncePrefs -> SimpleQuery
+renderAnnouncePrefs = queryToSimpleQuery . toQuery
 
--- | HTTP tracker request with extensions.
+-- | HTTP tracker request with preferences.
 data AnnounceRequest = AnnounceRequest
-  { announceQuery   :: AnnounceQuery    -- ^ Request query params.
-  , announceAdvises :: AnnounceQueryExt -- ^ Optional advises to the tracker.
+  { announceQuery :: AnnounceQuery -- ^ Request query params.
+  , announcePrefs :: AnnouncePrefs -- ^ Optional advises to the tracker.
   } deriving (Show, Eq, Typeable)
 
 instance QueryLike AnnounceRequest where
   toQuery AnnounceRequest{..} =
-    toQuery announceAdvises <>
+    toQuery announcePrefs <>
     toQuery announceQuery
 
 -- | Parse announce request from query string.
 parseAnnounceRequest :: SimpleQuery -> ParseResult AnnounceRequest
 parseAnnounceRequest params = AnnounceRequest
   <$> parseAnnounceQuery params
-  <*> pure (parseAnnounceQueryExt params)
+  <*> pure (parseAnnouncePrefs params)
 
 -- | Render announce request to query string.
 renderAnnounceRequest :: AnnounceRequest -> SimpleQuery
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 81199921..cc5bd318 100644
--- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
@@ -74,24 +74,24 @@ packHttpException m = try m >>= either (throwIO . RequestFailed) return
 -- | HTTP tracker specific RPC options.
 data Options = Options
   { -- | Global HTTP announce query preferences.
-    optAnnounceExt  :: !AnnounceQueryExt
+    optAnnouncePrefs :: !AnnouncePrefs
 
     -- | Whether to use HTTP proxy for HTTP tracker requests.
-  , optHttpProxy    :: !(Maybe Proxy)
+  , optHttpProxy     :: !(Maybe Proxy)
 
     -- | Value to put in HTTP user agent header.
-  , optUserAgent    :: !BS.ByteString
+  , optUserAgent     :: !BS.ByteString
 
     -- | HTTP manager options.
-  , optHttpOptions  :: !ManagerSettings
+  , optHttpOptions   :: !ManagerSettings
   }
 
 instance Default Options where
   def = Options
-    { optAnnounceExt = def
-    , optHttpProxy   = Nothing
-    , optUserAgent   = BC.pack libUserAgent
-    , optHttpOptions = defaultManagerSettings
+    { optAnnouncePrefs = def
+    , optHttpProxy     = Nothing
+    , optUserAgent     = BC.pack libUserAgent
+    , optHttpOptions   = defaultManagerSettings
     }
 
 -- | HTTP tracker manager.
@@ -148,8 +148,8 @@ announce :: Manager -> URI -> AnnounceQuery -> IO AnnounceInfo
 announce mgr uri q = httpTracker mgr uri (renderAnnounceRequest uriQ)
   where
     uriQ = AnnounceRequest
-      { announceQuery   = q
-      , announceAdvises = optAnnounceExt (options mgr)
+      { announceQuery = q
+      , announcePrefs = optAnnouncePrefs (options mgr)
       }
 
 -- | Trying to convert /announce/ URL to /scrape/ URL. If 'scrapeURL'